Smooth swapping (21/36)

Smooth swapping