Added changes to event controller