More changes in advance of implementing nearest neighbour interchange with upper information.