refactoring event, adding event_period