More versatile and efficient scheduler
Scheduler update