deleted orphan code
added rectangles (commented out)