Smooth swapping (22/36)

Smooth swapping