master
Fixed scheduler