Added reordering of axes.