improve TimeTable