Smooth swapping (26/36)

Smooth swapping