refactored schedules