Safety when swapping

Swaps