still trying to fix Schedule