Adjust scheduler
Merge branch 'leon'