Smooth swapping (7/36)

Smooth swapping