added more stuff to Timetable