exchanged circle and square