Lots of hacks to ensure this passed validation
Minor changes to ensure Pilot data passes validation