Major update to Scheduler.java