Swap: change the design