many changes to render the schedule as best we can