Add conditions to events
fix