Updates on Scheduler.cpp