Scheduling refactoring RC3