Scheduler implementation updates 2
Scheduler implementation updates 3