refactored event to use EventDate more