Updating Schedule: added some fixes