Update swapping, make it more clear.