Updating Scheduler MX for #10, #11