Improved Scheduler