Back to rectangles, finally