Events work better now