Updated EventController