refactoring timetable