refactored
added/refactored defaulttimetable