swaps changed to more obvious - sorted