Working swap, Piece/Circle structure changed