Smooth swapping (24/36)

Smooth swapping