checkin modification of event_server