Added timetable, refactored