renamed schedule
more refactoring