Better handling for a schedules and next tasks