Schedule Refactor 2 Fix (TEAM)