Changed the Event Class