FIX
# refactored Scheduler