Correction of transitions (wip)