Updated Schedule Generator