schedules + refactorings