Arrange when swapping