fixing to work on squaretag