Updated square and rect