Changes to the Events Controller