scheduler refactoring beta