More work on the schedule piece