Improved non-rectangular rooms.