Smooth swapping (31/36)

Smooth swapping