Changed Scheduler based on design's changing