Add reordering of connectivity to step-2