Smooth swapping (30/36)

Smooth swapping