schedule refactor
schedule refactor