Updated setSquare function calls