Scheduler working again