Smooth swapping (10/36)

Smooth swapping