Redesigning timetable (not finished)