more changes to scheduler