more changes for scheduler