done implementing better timetable decomposed components