Changes to Scheduler