before schedule refactoring