Revised basic rectangles to accept various points.