Improveded Scheduler a lot.