Better events in demo