almost done with SchedulingService commit