More event handler changes