Redesign Scheduler part 2