New modifications to pilot geometry
Merge pull request #3111 from friccita/PilotGeometryTakeII

Geometry -- New modifications to pilot geometry