Temp Fix Current Schedule, Still buggy