Small more bits on the events overhaul