Smooth swapping (35/36)

Smooth swapping