Merged the changes for mysched