Edited the Event Class