update Scheduler take 2