Added ability to show rectangles