improved timetable and handling