Changed BoundingBoxes to Rectangles