Plane Geometry (Revised)