Scheduler updates
Scheduler updates