Updated Schedule, attempted to fix merge issues