schedules refactoring (stage 4)