restructured the code a bit and added missing messages for SchedulerDriver