Smooth swapping (12/36)

Smooth swapping