default timetable added
refactoring