Smooth swapping (25/36)

Smooth swapping