kk
Before refactoring-commit
Refactor & fix sched