#45: Merged schedules and shifts