swapping now correct