Added cat and rect for testing