Plane refactored