Smooth swapping (29/36)

Smooth swapping