Pushed changes for scheduler
Again