Scheduler now ok