Use independent events (#106)