adding more scheduling related changes