Scheduler now accounts for fall/spring