Changed Events to When - Then syntax