Update to add detection and squares.