Order for Squares and circles corrected