EventScheduler modified