Added support for re-segmenting and T2 missing