more changes to the event class