Redesign Scheduler