Updated Scheduler