More changes to scheduler