@pdtf/schemas 3.6.0-dev.3 → 3.6.0-dev.32

package/{pensive-tesla-d0d355/src/schemas/v3/overlays/ta6.json → src/schemas/v3/overlays/ta6ed6v2.json}

@@ -1,74 +1,226 @@
 {
   "$schema": "http://json-schema.org/draft-07/schema#",
-  "$id": "https://trust.propdata.org.uk/schemas/v3/overlays/ta6.json",
+  "$id": "https://trust.propdata.org.uk/schemas/v3/overlays/ta6ed6v2.json",
   "required": [
     "participants",
     "propertyPack"
   ],
   "properties": {
+    "participants": {
+      "ta6ed6v2Ref": "1",
+      "items": {
+        "discriminator": {
+          "propertyName": "role"
+        },
+        "oneOf": [
+          {
+            "properties": {
+              "role": {
+                "enum": [
+                  "Prospective Buyer",
+                  "Buyer's Conveyancer",
+                  "Seller's Conveyancer",
+                  "Estate Agent",
+                  "Buyer's Agent",
+                  "Surveyor",
+                  "Mortgage Broker",
+                  "Lender",
+                  "Landlord",
+                  "Tenant",
+                  "Platform Support"
+                ]
+              }
+            }
+          },
+          {
+            "properties": {
+              "role": {
+                "enum": [
+                  "Buyer"
+                ]
+              }
+            }
+          },
+          {
+            "properties": {
+              "role": {
+                "enum": [
+                  "Seller"
+                ]
+              },
+              "sellersCapacity": {
+                "ta6ed6v2Ref": "1.4",
+                "discriminator": {
+                  "propertyName": "capacity"
+                },
+                "oneOf": [
+                  {
+                    "properties": {
+                      "capacity": {
+                        "enum": [
+                          "Legal Owner",
+                          "Mortgagee in Possession"
+                        ]
+                      }
+                    }
+                  },
+                  {
+                    "properties": {
+                      "capacity": {
+                        "enum": [
+                          "Personal Representative for a Deceased Owner",
+                          "Under Power of Attorney",
+                          "Trustee",
+                          "Assistant",
+                          "Other"
+                        ]
+                      }
+                    }
+                  },
+                  {
+                    "properties": {
+                      "capacity": {
+                        "enum": [
+                          "Company Director",
+                          "Company Secretary"
+                        ]
+                      },
+                      "companyNumber": {
+                        "ta6ed6v2Ref": "1.6.1"
+                      },
+                      "directorOrAuthorisedPerson": {
+                        "ta6ed6v2Ref": "1.6.2"
+                      },
+                      "countryOfIncorporation": {
+                        "ta6ed6v2Ref": "1.6.3"
+                      }
+                    }
+                  }
+                ],
+                "required": [
+                  "capacity"
+                ],
+                "title": "What is your role in the sale?",
+                "properties": {
+                  "capacity": {
+                    "ta6ed6v2Ref": "1.4",
+                    "enum": [
+                      "Legal Owner",
+                      "Company Director",
+                      "Personal Representative for a Deceased Owner",
+                      "Under Power of Attorney",
+                      "Trustee"
+                    ],
+                    "enumNames": [
+                      "Seller (Private individual)",
+                      "Seller (Company)",
+                      "Executor(s)/Administrator(s)",
+                      "Attorney(s)",
+                      "Trustee(s)"
+                    ]
+                  }
+                }
+              },
+              "dateBecameOwnerOrAuthority": {
+                "ta6ed6v2Ref": "1.5",
+                "title": "When did you become the owner of, or get authority to sell, the property? (DD/MM/YYYY)"
+              }
+            },
+            "required": [
+              "sellersCapacity",
+              "dateBecameOwnerOrAuthority"
+            ]
+          },
+          {
+            "properties": {
+              "role": {
+                "enum": [
+                  "Giftor"
+                ]
+              }
+            }
+          }
+        ],
+        "required": [
+          "role"
+        ],
+        "properties": {
+          "role": {
+            "ta6ed6v2Ref": "1"
+          }
+        }
+      }
+    },
     "propertyPack": {
-      "ta6Ref": "0",
       "required": [
         "address",
         "parking",
-        "listingAndConservation",
-        "energyEfficiency",
         "disputesAndComplaints",
         "alterationsAndChanges",
+        "listingAndConservation",
         "notices",
         "specialistIssues",
         "waterAndDrainage",
         "electricity",
         "heating",
+        "connectivity",
         "insurance",
         "rightsAndInformalArrangements",
         "environmentalIssues",
-        "additionalInformation",
         "legalBoundaries",
         "servicesCrossing",
         "electricalWorks",
         "guaranteesWarrantiesAndIndemnityInsurances",
         "occupiers",
         "completionAndMoving",
-        "confirmationOfAccuracyByOwners"
+        "confirmationOfAccuracyByOwners",
+        "additionalInformation"
       ],
       "properties": {
         "address": {
-          "ta6Ref": "0.1",
+          "ta6ed6v2Ref": "1.1",
           "required": [
             "line1",
             "postcode"
           ],
+          "title": "Address of the property",
           "properties": {
             "line1": {
-              "ta6Ref": "0.1.1"
+              "ta6ed6v2Ref": "1.1.1"
             },
             "line2": {
-              "ta6Ref": "0.1.2"
+              "ta6ed6v2Ref": "1.1.2"
             },
             "line3": {
-              "ta6Ref": "0.1.3"
+              "ta6ed6v2Ref": "1.1.3"
             },
             "town": {
-              "ta6Ref": "0.1.4"
+              "ta6ed6v2Ref": "1.1.4"
             },
             "postcode": {
-              "ta6Ref": "0.1.5"
+              "ta6ed6v2Ref": "1.1.5"
             }
           }
         },
+        "uprn": {
+          "ta6ed6v2Ref": "1.2",
+          "title": "UPRN (if known)",
+          "description": "Unique Property Reference Number (digits)"
+        },
         "parking": {
-          "ta6Ref": "9",
+          "ta6ed6v2Ref": "10",
           "required": [
             "parkingArrangements",
-            "controlledParking"
+            "controlledParking",
+            "electricVehicleChargingPoint"
           ],
           "properties": {
             "parkingArrangements": {
-              "ta6Ref": "9.1"
+              "ta6ed6v2Ref": "10.1",
+              "title": "What are the parking arrangements at the property?"
             },
             "controlledParking": {
-              "ta6Ref": "9.2",
+              "ta6ed6v2Ref": "10.2",
               "discriminator": {
                 "propertyName": "yesNo"
               },
@@ -77,8 +229,7 @@
                   "properties": {
                     "yesNo": {
                       "enum": [
-                        "No",
-                        "Not known"
+                        "No"
                       ]
                     }
                   }
@@ -96,24 +247,115 @@
               "required": [
                 "yesNo"
               ],
+              "title": "Is a permit required for on-road parking?",
+              "properties": {
+                "yesNo": {
+                  "ta6ed6v2Ref": "10.2.1",
+                  "enum": [
+                    "Yes",
+                    "No"
+                  ]
+                }
+              }
+            },
+            "electricVehicleChargingPoint": {
+              "ta6ed6v2Ref": "10.3",
+              "discriminator": {
+                "propertyName": "yesNo"
+              },
+              "oneOf": [
+                {
+                  "properties": {
+                    "yesNo": {
+                      "enum": [
+                        "No"
+                      ]
+                    }
+                  }
+                },
+                {
+                  "properties": {
+                    "yesNo": {
+                      "enum": [
+                        "Yes"
+                      ]
+                    },
+                    "chargerDetails": {
+                      "ta6ed6v2Ref": "10.3a"
+                    },
+                    "chargerDetailsAttachments": {
+                      "ta6ed6v2Ref": "10.3a1"
+                    },
+                    "cableCrossesPavement": {
+                      "ta6ed6v2Ref": "10.3b",
+                      "discriminator": {
+                        "propertyName": "yesNo"
+                      },
+                      "oneOf": [
+                        {
+                          "properties": {
+                            "yesNo": {
+                              "enum": [
+                                "No"
+                              ]
+                            }
+                          }
+                        },
+                        {
+                          "properties": {
+                            "yesNo": {
+                              "enum": [
+                                "Yes"
+                              ]
+                            },
+                            "details": {
+                              "ta6ed6v2Ref": "10.3b2"
+                            }
+                          },
+                          "required": [
+                            "details"
+                          ]
+                        }
+                      ],
+                      "required": [
+                        "yesNo"
+                      ],
+                      "properties": {
+                        "yesNo": {
+                          "ta6ed6v2Ref": "10.3b1"
+                        }
+                      }
+                    }
+                  },
+                  "required": [
+                    "chargerDetails",
+                    "cableCrossesPavement"
+                  ]
+                }
+              ],
+              "required": [
+                "yesNo"
+              ],
+              "title": "Does the property have an electric vehicle (EV) charging point?",
               "properties": {
                 "yesNo": {
-                  "ta6Ref": "9.2.1"
+                  "ta6ed6v2Ref": "10.3.1"
                 }
               }
             }
           }
         },
         "listingAndConservation": {
-          "ta6Ref": "4.7",
+          "ta6ed6v2Ref": "5.7",
           "required": [
             "isListed",
             "isConservationArea",
             "hasTreePreservationOrder"
           ],
+          "title": "Listed buildings and conservation area",
           "properties": {
             "isListed": {
-              "ta6Ref": "4.7a",
+              "ta6ed6v2Ref": "5.7",
               "discriminator": {
                 "propertyName": "yesNo"
               },
@@ -134,27 +376,22 @@
                       "enum": [
                         "Yes"
                       ]
-                    },
-                    "attachments": {
-                      "ta6Ref": "4.7a2"
                     }
-                  },
-                  "required": [
-                    "attachments"
-                  ]
+                  }
                 }
               ],
               "required": [
                 "yesNo"
               ],
+              "title": "Is the property (or any part of it) listed?",
               "properties": {
                 "yesNo": {
-                  "ta6Ref": "4.7a1"
+                  "ta6ed6v2Ref": "5.7.1"
                 }
               }
             },
             "isConservationArea": {
-              "ta6Ref": "4.7b",
+              "ta6ed6v2Ref": "5.8",
               "discriminator": {
                 "propertyName": "yesNo"
               },
@@ -175,27 +412,22 @@
                       "enum": [
                         "Yes"
                       ]
-                    },
-                    "attachments": {
-                      "ta6Ref": "4.7b2"
                     }
-                  },
-                  "required": [
-                    "attachments"
-                  ]
+                  }
                 }
               ],
               "required": [
                 "yesNo"
               ],
+              "title": "Is the property (or any part of it) in a conservation area?",
               "properties": {
                 "yesNo": {
-                  "ta6Ref": "4.7b1"
+                  "ta6ed6v2Ref": "5.8.1"
                 }
               }
             },
             "hasTreePreservationOrder": {
-              "ta6Ref": "4.8",
+              "ta6ed6v2Ref": "5.9",
               "discriminator": {
                 "propertyName": "yesNo"
               },
@@ -218,7 +450,7 @@
                       ]
                     },
                     "workCarriedOut": {
-                      "ta6Ref": "4.8a",
+                      "ta6ed6v2Ref": "5.9a",
                       "discriminator": {
                         "propertyName": "yesNo"
                       },
@@ -227,7 +459,8 @@
                           "properties": {
                             "yesNo": {
                               "enum": [
-                                "No"
+                                "No",
+                                "Not known"
                               ]
                             }
                           }
@@ -239,24 +472,27 @@
                                 "Yes"
                               ]
                             },
-                            "consentsObtained": {
-                              "ta6Ref": "4.8a2"
+                            "details": {
+                              "ta6ed6v2Ref": "5.9a2"
                             },
                             "attachments": {
-                              "ta6Ref": "4.8a3"
+                              "ta6ed6v2Ref": "5.9a3",
+                              "title": "Provide a copy of the TPO along with any relevant documents"
                             }
                           },
                           "required": [
-                            "consentsObtained"
+                            "details",
+                            "attachments"
                           ]
                         }
                       ],
                       "required": [
                         "yesNo"
                       ],
+                      "title": "Are you aware of any works carried out on those trees?",
                       "properties": {
                         "yesNo": {
-                          "ta6Ref": "4.8a1"
+                          "ta6ed6v2Ref": "5.9a1"
                         }
                       }
                     }
@@ -269,32 +505,27 @@
               "required": [
                 "yesNo"
               ],
+              "title": "Are any trees on or overhanging the property subject to a tree preservation order (TPO)?",
               "properties": {
                 "yesNo": {
-                  "ta6Ref": "4.8.1"
+                  "ta6ed6v2Ref": "5.9.1"
                 }
               }
             }
           }
         },
         "energyEfficiency": {
-          "ta6Ref": "7.6",
-          "required": [
-            "certificateIsSupplied",
-            "greenDealLoan"
-          ],
+          "ta6ed6v2Ref": "8",
           "properties": {
-            "certificateIsSupplied": {
-              "ta6Ref": "7.6.1"
-            },
             "greenDealLoan": {
-              "ta6Ref": "7.7",
+              "ta6ed6v2Ref": "8.5",
               "required": [
                 "hasGreenDealLoan"
               ],
+              "title": "Green Deal",
               "properties": {
                 "hasGreenDealLoan": {
-                  "ta6Ref": "7.7.0",
+                  "ta6ed6v2Ref": "8.5.1",
                   "discriminator": {
                     "propertyName": "yesNo"
                   },
@@ -316,10 +547,11 @@
                           ]
                         },
                         "details": {
-                          "ta6Ref": "7.7.2"
+                          "ta6ed6v2Ref": "8.5.1b",
+                          "title": "Give details of all installations and supply a copy of your last electricity bill"
                         },
                         "attachments": {
-                          "ta6Ref": "7.7.3"
+                          "ta6ed6v2Ref": "8.5.1c"
                         }
                       },
                       "required": [
@@ -331,9 +563,10 @@
                   "required": [
                     "yesNo"
                   ],
+                  "title": "Have any installations in the property been financed under the Green Deal scheme?",
                   "properties": {
                     "yesNo": {
-                      "ta6Ref": "7.7.1"
+                      "ta6ed6v2Ref": "8.5.1a"
                     }
                   }
                 }
@@ -342,14 +575,15 @@
           }
         },
         "disputesAndComplaints": {
-          "ta6Ref": "2",
+          "ta6ed6v2Ref": "3",
           "required": [
             "hasDisputesAndComplaints",
             "leadingToDisputesAndComplaints"
           ],
+          "title": "Disputes",
           "properties": {
             "hasDisputesAndComplaints": {
-              "ta6Ref": "2.1",
+              "ta6ed6v2Ref": "3.1",
               "discriminator": {
                 "propertyName": "yesNo"
               },
@@ -371,7 +605,8 @@
                       ]
                     },
                     "details": {
-                      "ta6Ref": "2.1.2"
+                      "ta6ed6v2Ref": "3.1.2",
+                      "title": "Give details such as when this took place and who was involved"
                     }
                   },
                   "required": [
@@ -382,15 +617,16 @@
               "required": [
                 "yesNo"
               ],
-              "title": "Have there been any disputes or complaints regarding this property or a property nearby?",
+              "title": "Are you aware of any disputes or complaints about the property or a property nearby?",
+              "description": "If yes, give details such as when this took place and who was involved:",
               "properties": {
                 "yesNo": {
-                  "ta6Ref": "2.1.1"
+                  "ta6ed6v2Ref": "3.1.1"
                 }
               }
             },
             "leadingToDisputesAndComplaints": {
-              "ta6Ref": "2.2",
+              "ta6ed6v2Ref": "3.2",
               "discriminator": {
                 "propertyName": "yesNo"
               },
@@ -412,7 +648,7 @@
                       ]
                     },
                     "details": {
-                      "ta6Ref": "2.2.2"
+                      "ta6ed6v2Ref": "3.2.2"
                     }
                   },
                   "required": [
@@ -423,28 +659,28 @@
               "required": [
                 "yesNo"
               ],
+              "title": "Are you aware of anything that might lead to a dispute about the property or a property nearby?",
+              "description": "If yes, please give details:",
               "properties": {
                 "yesNo": {
-                  "ta6Ref": "2.2.1"
+                  "ta6ed6v2Ref": "3.2.1"
                 }
               }
             }
           }
         },
         "alterationsAndChanges": {
-          "ta6Ref": "4.1",
+          "ta6ed6v2Ref": "5",
           "required": [
             "hasStructuralAlterations",
-            "changeOfUse",
-            "windowReplacementsSince2002",
-            "hasAddedConservatory",
-            "worksUnfinished",
+            "nonResidentialPurposes",
             "planningPermissionBreaches",
             "unresolvedPlanningIssues"
           ],
+          "title": "Alterations",
           "properties": {
             "hasStructuralAlterations": {
-              "ta6Ref": "4.1a",
+              "ta6ed6v2Ref": "5.1",
               "discriminator": {
                 "propertyName": "yesNo"
               },
@@ -465,11 +701,15 @@
                         "Yes"
                       ]
                     },
+                    "alterationTypes": {
+                      "ta6ed6v2Ref": "5.1"
+                    },
                     "details": {
-                      "ta6Ref": "4.1a2"
+                      "ta6ed6v2Ref": "5.2a",
+                      "title": "Give details of the work and the date it was carried out, or state not known"
                     },
-                    "buildingRegApproval": {
-                      "ta6Ref": "4.2",
+                    "workCompleted": {
+                      "ta6ed6v2Ref": "5.2b",
                       "discriminator": {
                         "propertyName": "yesNo"
                       },
@@ -480,25 +720,18 @@
                               "enum": [
                                 "Yes"
                               ]
-                            },
-                            "attachments": {
-                              "ta6Ref": "4.2a"
                             }
-                          },
-                          "required": [
-                            "attachments"
-                          ]
+                          }
                         },
                         {
                           "properties": {
                             "yesNo": {
                               "enum": [
-                                "No",
-                                "Not required"
+                                "No"
                               ]
                             },
                             "details": {
-                              "ta6Ref": "4.2b"
+                              "ta6ed6v2Ref": "5.2b"
                             }
                           },
                           "required": [
@@ -511,68 +744,22 @@
                       ],
                       "properties": {
                         "yesNo": {
-                          "ta6Ref": "4.2.1"
+                          "ta6ed6v2Ref": "5.2b"
                         }
                       }
                     },
-                    "planningPermission": {
-                      "ta6Ref": "4.2.1",
-                      "discriminator": {
-                        "propertyName": "yesNo"
-                      },
-                      "oneOf": [
-                        {
-                          "properties": {
-                            "yesNo": {
-                              "enum": [
-                                "Yes"
-                              ]
-                            },
-                            "attachments": {
-                              "ta6Ref": "4.2a"
-                            }
-                          },
-                          "required": [
-                            "attachments"
-                          ]
-                        },
-                        {
-                          "properties": {
-                            "yesNo": {
-                              "enum": [
-                                "No",
-                                "Not required"
-                              ]
-                            },
-                            "details": {
-                              "ta6Ref": "4.2b"
-                            }
-                          },
-                          "required": [
-                            "details"
-                          ]
-                        }
-                      ],
-                      "required": [
-                        "yesNo"
-                      ],
-                      "properties": {
-                        "yesNo": {
-                          "ta6Ref": "4.2.1"
-                        }
-                      }
+                    "documents": {
+                      "ta6ed6v2Ref": "5.2c"
                     },
-                    "listedBuildingConsent": {
-                      "oneOf": [
-                        {
-                          "required": [
-                            "attachments"
-                          ]
-                        }
-                      ]
+                    "approvalsObtained": {
+                      "ta6ed6v2Ref": "5.2d.i"
+                    },
+                    "approvalsNotRequiredReason": {
+                      "ta6ed6v2Ref": "5.2d.ii"
                     }
                   },
                   "required": [
+                    "alterationTypes",
                     "details"
                   ]
                 }
@@ -580,14 +767,15 @@
               "required": [
                 "yesNo"
               ],
+              "title": "Are you aware of any of the following alterations to the property?",
               "properties": {
                 "yesNo": {
-                  "ta6Ref": "4.1a1"
+                  "ta6ed6v2Ref": "5.1.1"
                 }
               }
             },
-            "changeOfUse": {
-              "ta6Ref": "4.1b",
+            "nonResidentialPurposes": {
+              "ta6ed6v2Ref": "5.3",
               "discriminator": {
                 "propertyName": "yesNo"
               },
@@ -608,540 +796,12 @@
                         "Yes"
                       ]
                     },
-                    "yearCompleted": {
-                      "ta6Ref": "4.1b2"
-                    },
-                    "buildingRegApproval": {
-                      "ta6Ref": "4.2",
-                      "discriminator": {
-                        "propertyName": "yesNo"
-                      },
-                      "oneOf": [
-                        {
-                          "properties": {
-                            "yesNo": {
-                              "enum": [
-                                "Yes"
-                              ]
-                            },
-                            "attachments": {
-                              "ta6Ref": "4.2a"
-                            }
-                          },
-                          "required": [
-                            "attachments"
-                          ]
-                        },
-                        {
-                          "properties": {
-                            "yesNo": {
-                              "enum": [
-                                "No",
-                                "Not required"
-                              ]
-                            },
-                            "details": {
-                              "ta6Ref": "4.2b"
-                            }
-                          },
-                          "required": [
-                            "details"
-                          ]
-                        }
-                      ],
-                      "required": [
-                        "yesNo"
-                      ],
-                      "properties": {
-                        "yesNo": {
-                          "ta6Ref": "4.2.1"
-                        }
-                      }
+                    "details": {
+                      "ta6ed6v2Ref": "5.3.2",
+                      "title": "Give details and supply a copy of any relevant planning permission"
                     },
-                    "planningPermission": {
-                      "ta6Ref": "4.2",
-                      "discriminator": {
-                        "propertyName": "yesNo"
-                      },
-                      "oneOf": [
-                        {
-                          "properties": {
-                            "yesNo": {
-                              "enum": [
-                                "Yes"
-                              ]
-                            },
-                            "attachments": {
-                              "ta6Ref": "4.2a"
-                            }
-                          },
-                          "required": [
-                            "attachments"
-                          ]
-                        },
-                        {
-                          "properties": {
-                            "yesNo": {
-                              "enum": [
-                                "No",
-                                "Not required"
-                              ]
-                            },
-                            "details": {
-                              "ta6Ref": "4.2b"
-                            }
-                          },
-                          "required": [
-                            "details"
-                          ]
-                        }
-                      ],
-                      "required": [
-                        "yesNo"
-                      ],
-                      "properties": {
-                        "yesNo": {
-                          "ta6Ref": "4.2.1"
-                        }
-                      }
-                    }
-                  },
-                  "required": [
-                    "yearCompleted"
-                  ]
-                }
-              ],
-              "required": [
-                "yesNo"
-              ],
-              "properties": {
-                "yesNo": {
-                  "ta6Ref": "4.1b1"
-                }
-              }
-            },
-            "windowReplacementsSince2002": {
-              "ta6Ref": "4.1c",
-              "discriminator": {
-                "propertyName": "yesNo"
-              },
-              "oneOf": [
-                {
-                  "properties": {
-                    "yesNo": {
-                      "enum": [
-                        "No"
-                      ]
-                    }
-                  }
-                },
-                {
-                  "properties": {
-                    "yesNo": {
-                      "enum": [
-                        "Yes"
-                      ]
-                    },
-                    "yearCompleted": {
-                      "ta6Ref": "4.1c2"
-                    },
-                    "buildingRegApproval": {
-                      "ta6Ref": "4.2",
-                      "discriminator": {
-                        "propertyName": "yesNo"
-                      },
-                      "oneOf": [
-                        {
-                          "properties": {
-                            "yesNo": {
-                              "enum": [
-                                "Yes"
-                              ]
-                            },
-                            "attachments": {
-                              "ta6Ref": "4.2a"
-                            }
-                          },
-                          "required": [
-                            "attachments"
-                          ]
-                        },
-                        {
-                          "properties": {
-                            "yesNo": {
-                              "enum": [
-                                "No",
-                                "Not required"
-                              ]
-                            },
-                            "details": {
-                              "ta6Ref": "4.2b"
-                            }
-                          },
-                          "required": [
-                            "details"
-                          ]
-                        }
-                      ],
-                      "required": [
-                        "yesNo"
-                      ],
-                      "properties": {
-                        "yesNo": {
-                          "ta6Ref": "4.2.1"
-                        }
-                      }
-                    },
-                    "planningPermission": {
-                      "ta6Ref": "4.2",
-                      "discriminator": {
-                        "propertyName": "yesNo"
-                      },
-                      "oneOf": [
-                        {
-                          "properties": {
-                            "yesNo": {
-                              "enum": [
-                                "Yes"
-                              ]
-                            },
-                            "attachments": {
-                              "ta6Ref": "4.2a"
-                            }
-                          },
-                          "required": [
-                            "attachments"
-                          ]
-                        },
-                        {
-                          "properties": {
-                            "yesNo": {
-                              "enum": [
-                                "No",
-                                "Not required"
-                              ]
-                            },
-                            "details": {
-                              "ta6Ref": "4.2b"
-                            }
-                          },
-                          "required": [
-                            "details"
-                          ]
-                        }
-                      ],
-                      "required": [
-                        "yesNo"
-                      ],
-                      "properties": {
-                        "yesNo": {
-                          "ta6Ref": "4.2.1"
-                        }
-                      }
-                    }
-                  },
-                  "required": [
-                    "yearCompleted"
-                  ]
-                }
-              ],
-              "required": [
-                "yesNo"
-              ],
-              "properties": {
-                "yesNo": {
-                  "ta6Ref": "4.1c1"
-                }
-              }
-            },
-            "hasAddedConservatory": {
-              "ta6Ref": "4.1d",
-              "discriminator": {
-                "propertyName": "yesNo"
-              },
-              "oneOf": [
-                {
-                  "properties": {
-                    "yesNo": {
-                      "enum": [
-                        "No"
-                      ]
-                    }
-                  }
-                },
-                {
-                  "properties": {
-                    "yesNo": {
-                      "enum": [
-                        "Yes"
-                      ]
-                    },
-                    "yearCompleted": {
-                      "ta6Ref": "4.1d2"
-                    },
-                    "buildingRegApproval": {
-                      "ta6Ref": "4.2",
-                      "discriminator": {
-                        "propertyName": "yesNo"
-                      },
-                      "oneOf": [
-                        {
-                          "properties": {
-                            "yesNo": {
-                              "enum": [
-                                "Yes"
-                              ]
-                            },
-                            "attachments": {
-                              "ta6Ref": "4.2a"
-                            }
-                          },
-                          "required": [
-                            "attachments"
-                          ]
-                        },
-                        {
-                          "properties": {
-                            "yesNo": {
-                              "enum": [
-                                "No",
-                                "Not required"
-                              ]
-                            },
-                            "details": {
-                              "ta6Ref": "4.2b"
-                            }
-                          },
-                          "required": [
-                            "details"
-                          ]
-                        }
-                      ],
-                      "required": [
-                        "yesNo"
-                      ],
-                      "properties": {
-                        "yesNo": {
-                          "ta6Ref": "4.2.1"
-                        }
-                      }
-                    },
-                    "planningPermission": {
-                      "ta6Ref": "4.2",
-                      "discriminator": {
-                        "propertyName": "yesNo"
-                      },
-                      "oneOf": [
-                        {
-                          "properties": {
-                            "yesNo": {
-                              "enum": [
-                                "Yes"
-                              ]
-                            },
-                            "attachments": {
-                              "ta6Ref": "4.2a"
-                            }
-                          },
-                          "required": [
-                            "attachments"
-                          ]
-                        },
-                        {
-                          "properties": {
-                            "yesNo": {
-                              "enum": [
-                                "No",
-                                "Not required"
-                              ]
-                            },
-                            "details": {
-                              "ta6Ref": "4.2b"
-                            }
-                          },
-                          "required": [
-                            "details"
-                          ]
-                        }
-                      ],
-                      "required": [
-                        "yesNo"
-                      ],
-                      "properties": {
-                        "yesNo": {
-                          "ta6Ref": "4.2.1"
-                        }
-                      }
-                    }
-                  },
-                  "required": [
-                    "yearCompleted"
-                  ]
-                }
-              ],
-              "required": [
-                "yesNo"
-              ],
-              "properties": {
-                "yesNo": {
-                  "ta6Ref": "4.1d1"
-                }
-              }
-            },
-            "worksUnfinished": {
-              "ta6Ref": "4.3",
-              "discriminator": {
-                "propertyName": "yesNo"
-              },
-              "oneOf": [
-                {
-                  "properties": {
-                    "yesNo": {
-                      "enum": [
-                        "No"
-                      ]
-                    }
-                  }
-                },
-                {
-                  "properties": {
-                    "yesNo": {
-                      "enum": [
-                        "Yes"
-                      ]
-                    },
-                    "details": {
-                      "ta6Ref": "4.3.2"
-                    }
-                  },
-                  "required": [
-                    "details"
-                  ]
-                }
-              ],
-              "required": [
-                "yesNo"
-              ],
-              "properties": {
-                "yesNo": {
-                  "ta6Ref": "4.3.1"
-                }
-              }
-            },
-            "planningPermissionBreaches": {
-              "ta6Ref": "4.4",
-              "discriminator": {
-                "propertyName": "yesNo"
-              },
-              "oneOf": [
-                {
-                  "properties": {
-                    "yesNo": {
-                      "enum": [
-                        "No"
-                      ]
-                    }
-                  }
-                },
-                {
-                  "properties": {
-                    "yesNo": {
-                      "enum": [
-                        "Yes"
-                      ]
-                    },
-                    "details": {
-                      "ta6Ref": "4.4.2"
-                    }
-                  },
-                  "required": [
-                    "details"
-                  ]
-                }
-              ],
-              "required": [
-                "yesNo"
-              ],
-              "properties": {
-                "yesNo": {
-                  "ta6Ref": "4.4.1"
-                }
-              }
-            },
-            "unresolvedPlanningIssues": {
-              "ta6Ref": "4.5",
-              "discriminator": {
-                "propertyName": "yesNo"
-              },
-              "oneOf": [
-                {
-                  "properties": {
-                    "yesNo": {
-                      "enum": [
-                        "No"
-                      ]
-                    }
-                  }
-                },
-                {
-                  "properties": {
-                    "yesNo": {
-                      "enum": [
-                        "Yes"
-                      ]
-                    },
-                    "details": {
-                      "ta6Ref": "4.5.2"
-                    }
-                  },
-                  "required": [
-                    "details"
-                  ]
-                }
-              ],
-              "required": [
-                "yesNo"
-              ],
-              "properties": {
-                "yesNo": {
-                  "ta6Ref": "4.5.1"
-                }
-              }
-            }
-          }
-        },
-        "notices": {
-          "ta6Ref": "3",
-          "required": [
-            "neighbourDevelopment",
-            "partyWallAct",
-            "otherNotices"
-          ],
-          "properties": {
-            "neighbourDevelopment": {
-              "ta6Ref": "3.2",
-              "discriminator": {
-                "propertyName": "yesNo"
-              },
-              "oneOf": [
-                {
-                  "properties": {
-                    "yesNo": {
-                      "enum": [
-                        "No"
-                      ]
-                    }
-                  }
-                },
-                {
-                  "properties": {
-                    "yesNo": {
-                      "enum": [
-                        "Yes"
-                      ]
-                    },
-                    "details": {
-                      "ta6Ref": "3.2.2"
+                    "attachments": {
+                      "ta6ed6v2Ref": "5.3.3"
                     }
                   },
                   "required": [
@@ -1152,15 +812,14 @@
               "required": [
                 "yesNo"
               ],
-              "title": "Is the seller aware of any proposals to develop property or land nearby, or of any proposals to make alterations to buildings nearby?",
               "properties": {
                 "yesNo": {
-                  "ta6Ref": "3.2.1"
+                  "ta6ed6v2Ref": "5.3.1"
                 }
               }
             },
-            "planningApplication": {
-              "ta6Ref": "3.1",
+            "planningPermissionBreaches": {
+              "ta6ed6v2Ref": "5.4",
               "discriminator": {
                 "propertyName": "yesNo"
               },
@@ -1182,7 +841,7 @@
                       ]
                     },
                     "details": {
-                      "ta6Ref": "3.1.2"
+                      "ta6ed6v2Ref": "5.4.2"
                     }
                   },
                   "required": [
@@ -1193,14 +852,15 @@
               "required": [
                 "yesNo"
               ],
+              "title": "Are you aware of any breaches of planning permission conditions or building regulations consent conditions, unfinished work or work that does not have all necessary consents?",
               "properties": {
                 "yesNo": {
-                  "ta6Ref": "3.1.1"
+                  "ta6ed6v2Ref": "5.4.1"
                 }
               }
             },
-            "requiredMaintenance": {
-              "ta6Ref": "3.1",
+            "unresolvedPlanningIssues": {
+              "ta6ed6v2Ref": "5.5",
               "discriminator": {
                 "propertyName": "yesNo"
               },
@@ -1222,7 +882,7 @@
                       ]
                     },
                     "details": {
-                      "ta6Ref": "3.1.2"
+                      "ta6ed6v2Ref": "5.5.2"
                     }
                   },
                   "required": [
@@ -1233,14 +893,26 @@
               "required": [
                 "yesNo"
               ],
+              "title": "Are you aware of any planning or building control issues that need to be resolved?",
               "properties": {
                 "yesNo": {
-                  "ta6Ref": "3.1.1"
+                  "ta6ed6v2Ref": "5.5.1"
                 }
               }
-            },
-            "listedBuildingApplication": {
-              "ta6Ref": "3.1",
+            }
+          }
+        },
+        "notices": {
+          "ta6ed6v2Ref": "4",
+          "required": [
+            "otherNotices",
+            "neighbourDevelopment",
+            "planningApplication"
+          ],
+          "title": "Notices",
+          "properties": {
+            "neighbourDevelopment": {
+              "ta6ed6v2Ref": "4.2",
               "discriminator": {
                 "propertyName": "yesNo"
               },
@@ -1262,7 +934,8 @@
                       ]
                     },
                     "details": {
-                      "ta6Ref": "3.1.2"
+                      "ta6ed6v2Ref": "4.2.2",
+                      "title": "Please give details"
                     }
                   },
                   "required": [
@@ -1273,14 +946,15 @@
               "required": [
                 "yesNo"
               ],
+              "title": "Are you aware of any plans or proposals to develop property or land nearby?",
               "properties": {
                 "yesNo": {
-                  "ta6Ref": "3.1.1"
+                  "ta6ed6v2Ref": "4.2.1"
                 }
               }
             },
-            "infrastructureProject": {
-              "ta6Ref": "3.1",
+            "planningApplication": {
+              "ta6ed6v2Ref": "4.3",
               "discriminator": {
                 "propertyName": "yesNo"
               },
@@ -1302,7 +976,8 @@
                       ]
                     },
                     "details": {
-                      "ta6Ref": "3.1.2"
+                      "ta6ed6v2Ref": "4.3.2",
+                      "title": "Please give details"
                     }
                   },
                   "required": [
@@ -1313,14 +988,15 @@
               "required": [
                 "yesNo"
               ],
+              "title": "Are you aware of any proposals to make alterations to or change the use of buildings nearby?",
               "properties": {
                 "yesNo": {
-                  "ta6Ref": "3.1.1"
+                  "ta6ed6v2Ref": "4.3.1"
                 }
               }
             },
             "partyWallAct": {
-              "ta6Ref": "1.6",
+              "ta6ed6v2Ref": "2.5",
               "discriminator": {
                 "propertyName": "yesNo"
               },
@@ -1342,10 +1018,11 @@
                       ]
                     },
                     "details": {
-                      "ta6Ref": "1.6.2"
+                      "ta6ed6v2Ref": "2.5.2",
+                      "title": "Supply a copy and give details of any works carried out or agreed"
                     },
                     "attachments": {
-                      "ta6Ref": "1.6.3"
+                      "ta6ed6v2Ref": "2.5.3"
                     }
                   },
                   "required": [
@@ -1356,14 +1033,15 @@
               "required": [
                 "yesNo"
               ],
+              "title": "Are you aware of any notice being served or received under the Party Wall etc. Act 1996 in respect of any shared/party walls or boundaries?",
               "properties": {
                 "yesNo": {
-                  "ta6Ref": "1.6.1"
+                  "ta6ed6v2Ref": "2.5.1"
                 }
               }
             },
             "otherNotices": {
-              "ta6Ref": "3.1",
+              "ta6ed6v2Ref": "4.1",
               "discriminator": {
                 "propertyName": "yesNo"
               },
@@ -1385,7 +1063,8 @@
                       ]
                     },
                     "details": {
-                      "ta6Ref": "3.1.2"
+                      "ta6ed6v2Ref": "4.1.2",
+                      "title": "Please give details"
                     }
                   },
                   "required": [
@@ -1396,22 +1075,23 @@
               "required": [
                 "yesNo"
               ],
+              "title": "Are you aware of any notices, communications, negotiations or discussions which affect the property or a property nearby? For example, from or to a neighbour, council or government department.",
               "properties": {
                 "yesNo": {
-                  "ta6Ref": "3.1.1"
+                  "ta6ed6v2Ref": "4.1.1"
                 }
               }
             }
           }
         },
         "specialistIssues": {
-          "ta6Ref": "7.8",
+          "ta6ed6v2Ref": "8.6",
           "required": [
             "japaneseKnotweed"
           ],
           "properties": {
             "japaneseKnotweed": {
-              "ta6Ref": "7.8",
+              "ta6ed6v2Ref": "8.6",
               "discriminator": {
                 "propertyName": "yesNo"
               },
@@ -1434,7 +1114,8 @@
                       ]
                     },
                     "managementPlanInPlace": {
-                      "ta6Ref": "7.8.2"
+                      "ta6ed6v2Ref": "8.6.2",
+                      "title": "Is there a Japanese knotweed management and treatment plan in place?"
                     }
                   },
                   "required": [
@@ -1448,7 +1129,8 @@
                       ],
                       "properties": {
                         "attachments": {
-                          "ta6Ref": "7.8.3"
+                          "ta6ed6v2Ref": "8.6.3",
+                          "title": "Provide a copy of the plan with any insurance cover linked to the plan."
                         }
                       }
                     }
@@ -1456,11 +1138,54 @@
                 }
               ],
               "required": [
-                "yesNo"
+                "yesNo",
+                "knotweedSurveyCarriedOut"
               ],
+              "title": "Japanese knotweed",
               "properties": {
+                "knotweedSurveyCarriedOut": {
+                  "ta6ed6v2Ref": "8.7",
+                  "discriminator": {
+                    "propertyName": "yesNo"
+                  },
+                  "oneOf": [
+                    {
+                      "properties": {
+                        "yesNo": {
+                          "enum": [
+                            "No",
+                            "Not known"
+                          ]
+                        }
+                      }
+                    },
+                    {
+                      "properties": {
+                        "yesNo": {
+                          "enum": [
+                            "Yes"
+                          ]
+                        },
+                        "attachments": {
+                          "ta6ed6v2Ref": "8.7.2"
+                        }
+                      },
+                      "required": [
+                        "attachments"
+                      ]
+                    }
+                  ],
+                  "required": [
+                    "yesNo"
+                  ],
+                  "properties": {
+                    "yesNo": {
+                      "ta6ed6v2Ref": "8.7.1"
+                    }
+                  }
+                },
                 "yesNo": {
-                  "ta6Ref": "7.8.1",
+                  "ta6ed6v2Ref": "8.6.1",
                   "title": "Is the property affected by Japanese knotweed?"
                 }
               }
@@ -1468,14 +1193,13 @@
           }
         },
         "electricity": {
-          "ta6Ref": "13.1",
+          "ta6ed6v2Ref": "12.1",
           "required": [
-            "mainsElectricity",
-            "solarPanels"
+            "mainsElectricity"
           ],
           "properties": {
             "mainsElectricity": {
-              "ta6Ref": "13.1",
+              "ta6ed6v2Ref": "12.1",
               "discriminator": {
                 "propertyName": "yesNo"
               },
@@ -1497,16 +1221,24 @@
                       ]
                     },
                     "supplier": {
-                      "ta6Ref": "13.1.2"
+                      "ta6ed6v2Ref": "12.1.2",
+                      "title": "Provider's name"
                     },
                     "electricityMeter": {
-                      "ta6Ref": "13.1b",
+                      "ta6ed6v2Ref": "12.1.3",
                       "required": [
-                        "location"
+                        "location",
+                        "mpan"
                       ],
                       "properties": {
                         "location": {
-                          "ta6Ref": "13.1b1"
+                          "ta6ed6v2Ref": "12.1.3",
+                          "title": "Location of meter"
+                        },
+                        "mpan": {
+                          "ta6ed6v2Ref": "12.1.4",
+                          "title": "MPAN number",
+                          "description": "Your MPAN is on your electricity or dual fuel bill, usually in a box marked 'Supply Number'. It's 21 digits long and begins with 'S'. You'll only need the last 12 or 13 digits."
                         }
                       }
                     }
@@ -1522,9 +1254,6 @@
                       "enum": [
                         "To be connected"
                       ]
-                    },
-                    "supplier": {
-                      "ta6Ref": "13.1.2"
                     }
                   }
                 }
@@ -1534,7 +1263,7 @@
               ],
               "properties": {
                 "yesNo": {
-                  "ta6Ref": "13.1.1",
+                  "ta6ed6v2Ref": "12.1.1",
                   "enum": [
                     "Yes",
                     "No"
@@ -1543,7 +1272,7 @@
               }
             },
             "solarPanels": {
-              "ta6Ref": "4.6",
+              "ta6ed6v2Ref": "5.6",
               "discriminator": {
                 "propertyName": "yesNo"
               },
@@ -1564,11 +1293,15 @@
                         "Yes"
                       ]
                     },
+                    "hotWaterOnly": {
+                      "ta6ed6v2Ref": "5.6a"
+                    },
                     "yearInstalled": {
-                      "ta6Ref": "4.6a"
+                      "ta6ed6v2Ref": "5.6b",
+                      "title": "Which year was the system installed? (YYYY)"
                     },
                     "panelsOwnedOutright": {
-                      "ta6Ref": "4.6b",
+                      "ta6ed6v2Ref": "5.6c",
                       "discriminator": {
                         "propertyName": "yesNo"
                       },
@@ -1595,14 +1328,138 @@
                       "required": [
                         "yesNo"
                       ],
+                      "title": "Do you own the system outright?",
                       "properties": {
                         "yesNo": {
-                          "ta6Ref": "4.6b1"
+                          "ta6ed6v2Ref": "5.6c"
                         }
                       }
                     },
                     "panelProviderLease": {
-                      "ta6Ref": "4.6c",
+                      "ta6ed6v2Ref": "5.6d",
+                      "discriminator": {
+                        "propertyName": "yesNo"
+                      },
+                      "oneOf": [
+                        {
+                          "properties": {
+                            "yesNo": {
+                              "enum": [
+                                "No"
+                              ]
+                            }
+                          }
+                        },
+                        {
+                          "properties": {
+                            "yesNo": {
+                              "enum": [
+                                "Yes"
+                              ]
+                            },
+                            "attachments": {
+                              "ta6ed6v2Ref": "5.6d2"
+                            }
+                          }
+                        }
+                      ],
+                      "required": [
+                        "yesNo"
+                      ],
+                      "title": "Has a long lease of the roof or air space been granted to a solar power system provider? A typical long lease may last 20 to 25 years.",
+                      "properties": {
+                        "yesNo": {
+                          "ta6ed6v2Ref": "5.6d1"
+                        }
+                      }
+                    },
+                    "maintenanceAgreement": {
+                      "ta6ed6v2Ref": "5.6e",
+                      "discriminator": {
+                        "propertyName": "yesNo"
+                      },
+                      "oneOf": [
+                        {
+                          "properties": {
+                            "yesNo": {
+                              "enum": [
+                                "No"
+                              ]
+                            }
+                          }
+                        },
+                        {
+                          "properties": {
+                            "yesNo": {
+                              "enum": [
+                                "Yes"
+                              ]
+                            },
+                            "attachments": {
+                              "ta6ed6v2Ref": "5.6e2"
+                            }
+                          },
+                          "required": [
+                            "attachments"
+                          ]
+                        }
+                      ],
+                      "required": [
+                        "yesNo"
+                      ],
+                      "properties": {
+                        "yesNo": {
+                          "ta6ed6v2Ref": "5.6e1"
+                        }
+                      }
+                    },
+                    "photovoltaicBatteries": {
+                      "ta6ed6v2Ref": "5.6f",
+                      "discriminator": {
+                        "propertyName": "yesNo"
+                      },
+                      "oneOf": [
+                        {
+                          "properties": {
+                            "yesNo": {
+                              "enum": [
+                                "No"
+                              ]
+                            }
+                          }
+                        },
+                        {
+                          "properties": {
+                            "yesNo": {
+                              "enum": [
+                                "Yes"
+                              ]
+                            },
+                            "description": {
+                              "ta6ed6v2Ref": "5.6f1"
+                            },
+                            "details": {
+                              "ta6ed6v2Ref": "5.6f2"
+                            }
+                          },
+                          "required": [
+                            "description",
+                            "details"
+                          ]
+                        }
+                      ],
+                      "required": [
+                        "yesNo"
+                      ],
+                      "title": "Is there a battery for storing solar power?",
+                      "properties": {
+                        "yesNo": {
+                          "ta6ed6v2Ref": "5.6f"
+                        }
+                      }
+                    },
+                    "nationalGrid": {
+                      "ta6ed6v2Ref": "5.6g",
                       "discriminator": {
                         "propertyName": "yesNo"
                       },
@@ -1615,37 +1472,147 @@
                               ]
                             }
                           }
-                        },
-                        {
-                          "properties": {
-                            "yesNo": {
-                              "enum": [
-                                "Yes"
-                              ]
-                            },
-                            "attachments": {
-                              "ta6Ref": "4.6c2"
-                            }
-                          },
-                          "required": [
-                            "attachments"
-                          ]
+                        },
+                        {
+                          "properties": {
+                            "yesNo": {
+                              "enum": [
+                                "Yes"
+                              ]
+                            },
+                            "fitOrSegInPlace": {
+                              "ta6ed6v2Ref": "5.6g1",
+                              "discriminator": {
+                                "propertyName": "yesNo"
+                              },
+                              "oneOf": [
+                                {
+                                  "properties": {
+                                    "yesNo": {
+                                      "enum": [
+                                        "No"
+                                      ]
+                                    }
+                                  }
+                                },
+                                {
+                                  "properties": {
+                                    "yesNo": {
+                                      "enum": [
+                                        "Yes"
+                                      ]
+                                    },
+                                    "fitSegAgreementCopy": {
+                                      "ta6ed6v2Ref": "5.6g2"
+                                    },
+                                    "attachments": {
+                                      "ta6ed6v2Ref": "5.6g3"
+                                    },
+                                    "fitSegAssignmentProcedure": {
+                                      "ta6ed6v2Ref": "5.6g4"
+                                    }
+                                  }
+                                }
+                              ],
+                              "required": [
+                                "yesNo"
+                              ],
+                              "properties": {
+                                "yesNo": {
+                                  "ta6ed6v2Ref": "5.6g1a"
+                                }
+                              }
+                            }
+                          }
                         }
                       ],
                       "required": [
                         "yesNo"
                       ],
+                      "title": "Does the system feed into the National Grid?",
                       "properties": {
                         "yesNo": {
-                          "ta6Ref": "4.6c1"
+                          "ta6ed6v2Ref": "5.6g"
                         }
                       }
+                    },
+                    "installationCertificates": {
+                      "ta6ed6v2Ref": "5.6h"
                     }
                   },
                   "required": [
+                    "hotWaterOnly",
                     "yearInstalled",
                     "panelsOwnedOutright",
-                    "panelProviderLease"
+                    "panelProviderLease",
+                    "maintenanceAgreement",
+                    "photovoltaicBatteries",
+                    "nationalGrid",
+                    "installationCertificates"
+                  ]
+                },
+                {
+                  "properties": {
+                    "yesNo": {
+                      "enum": [
+                        "To be connected"
+                      ]
+                    }
+                  }
+                }
+              ],
+              "required": [
+                "yesNo"
+              ],
+              "title": "Has a solar power system for generating electricity, hot water or heating been installed at the property?",
+              "properties": {
+                "yesNo": {
+                  "ta6ed6v2Ref": "5.6",
+                  "enum": [
+                    "Yes",
+                    "No"
+                  ]
+                }
+              }
+            },
+            "heatPump": {
+              "ta6ed6v2Ref": "12.6",
+              "discriminator": {
+                "propertyName": "yesNo"
+              },
+              "oneOf": [
+                {
+                  "properties": {
+                    "yesNo": {
+                      "enum": [
+                        "No"
+                      ]
+                    }
+                  }
+                },
+                {
+                  "properties": {
+                    "yesNo": {
+                      "enum": [
+                        "Yes"
+                      ]
+                    },
+                    "supplier": {
+                      "ta6ed6v2Ref": "12.6.2",
+                      "title": "Provider name"
+                    },
+                    "makeModel": {
+                      "ta6ed6v2Ref": "12.6.3"
+                    },
+                    "serviceProviderName": {
+                      "ta6ed6v2Ref": "12.6.4",
+                      "title": "Service provider's name"
+                    }
+                  },
+                  "required": [
+                    "supplier",
+                    "makeModel",
+                    "serviceProviderName"
                   ]
                 },
                 {
@@ -1661,9 +1628,10 @@
               "required": [
                 "yesNo"
               ],
+              "title": "Shared ground / air source heat pumps",
               "properties": {
                 "yesNo": {
-                  "ta6Ref": "4.6",
+                  "ta6ed6v2Ref": "12.6.1",
                   "enum": [
                     "Yes",
                     "No"
@@ -1674,20 +1642,20 @@
           }
         },
         "waterAndDrainage": {
-          "ta6Ref": "13",
+          "ta6ed6v2Ref": "11",
           "required": [
             "water",
             "drainage"
           ],
           "properties": {
             "water": {
-              "ta6Ref": "13",
+              "ta6ed6v2Ref": "12.3",
               "required": [
                 "mainsWater"
               ],
               "properties": {
                 "mainsWater": {
-                  "ta6Ref": "13.3",
+                  "ta6ed6v2Ref": "12.3",
                   "discriminator": {
                     "propertyName": "yesNo"
                   },
@@ -1709,18 +1677,23 @@
                           ]
                         },
                         "supplier": {
-                          "ta6Ref": "13.3.2"
+                          "ta6ed6v2Ref": "12.3.2",
+                          "title": "Provider's name"
                         },
                         "stopcock": {
-                          "ta6Ref": "13.3b",
+                          "ta6ed6v2Ref": "12.3.3",
+                          "required": [
+                            "location"
+                          ],
                           "properties": {
                             "location": {
-                              "ta6Ref": "13.3b1"
+                              "ta6ed6v2Ref": "12.3.3",
+                              "title": "Location of stopcock"
                             }
                           }
                         },
                         "waterMeter": {
-                          "ta6Ref": "13.3b",
+                          "ta6ed6v2Ref": "12.3.4",
                           "discriminator": {
                             "propertyName": "isSupplyMetered"
                           },
@@ -1742,7 +1715,8 @@
                                   ]
                                 },
                                 "location": {
-                                  "ta6Ref": "13.3b2"
+                                  "ta6ed6v2Ref": "12.3.4",
+                                  "title": "Location of meter (if any)"
                                 }
                               },
                               "required": [
@@ -1755,7 +1729,7 @@
                           ],
                           "properties": {
                             "isSupplyMetered": {
-                              "ta6Ref": "13.3b"
+                              "ta6ed6v2Ref": "12.3.4"
                             }
                           }
                         }
@@ -1772,9 +1746,6 @@
                           "enum": [
                             "To be connected"
                           ]
-                        },
-                        "supplier": {
-                          "ta6Ref": "13.3.2"
                         }
                       }
                     }
@@ -1784,7 +1755,7 @@
                   ],
                   "properties": {
                     "yesNo": {
-                      "ta6Ref": "13.3.1",
+                      "ta6ed6v2Ref": "12.3.1",
                       "enum": [
                         "Yes",
                         "No"
@@ -1795,14 +1766,15 @@
               }
             },
             "drainage": {
-              "ta6Ref": "12.4",
+              "ta6ed6v2Ref": "11.5",
               "required": [
-                "mainsSurfaceWaterDrainage",
-                "mainsFoulDrainage"
+                "mainsFoulDrainage",
+                "mainsSurfaceWaterDrainage"
               ],
+              "title": "Drains and sewers",
               "properties": {
                 "mainsSurfaceWaterDrainage": {
-                  "ta6Ref": "12.4b",
+                  "ta6ed6v2Ref": "11.5b",
                   "discriminator": {
                     "propertyName": "yesNo"
                   },
@@ -1839,9 +1811,10 @@
                   "required": [
                     "yesNo"
                   ],
+                  "title": "Surface water drainage?",
                   "properties": {
                     "yesNo": {
-                      "ta6Ref": "12.4b1",
+                      "ta6ed6v2Ref": "11.5b",
                       "enum": [
                         "Yes",
                         "No",
@@ -1851,7 +1824,7 @@
                   }
                 },
                 "mainsFoulDrainage": {
-                  "ta6Ref": "12.4a",
+                  "ta6ed6v2Ref": "11.5a",
                   "discriminator": {
                     "propertyName": "yesNo"
                   },
@@ -1864,7 +1837,8 @@
                           ]
                         },
                         "supplier": {
-                          "ta6Ref": "13.4.2"
+                          "ta6ed6v2Ref": "12.4.2",
+                          "title": "Provider's name"
                         }
                       },
                       "required": [
@@ -1877,9 +1851,6 @@
                           "enum": [
                             "To be connected"
                           ]
-                        },
-                        "supplier": {
-                          "ta6Ref": "13.4.2"
                         }
                       }
                     },
@@ -1892,7 +1863,7 @@
                           ]
                         },
                         "offMainsDrainageSystem": {
-                          "ta6Ref": "12.4a",
+                          "ta6ed6v2Ref": "11.6",
                           "discriminator": {
                             "propertyName": "offMainsDrainageSystemType"
                           },
@@ -1913,15 +1884,30 @@
                                     "Septic tank"
                                   ]
                                 },
+                                "dateDischargeCommenced": {
+                                  "ta6ed6v2Ref": "11.7a",
+                                  "title": "When did the discharge commence? (MM/YYYY)"
+                                },
+                                "dateInstalled": {
+                                  "ta6ed6v2Ref": "11.7b",
+                                  "title": "When was the system installed? (MM/YYYY)"
+                                },
                                 "dateReplaced": {
-                                  "ta6Ref": "12.5.1"
+                                  "ta6ed6v2Ref": "11.7c",
+                                  "title": "When was the sewerage system last replaced or upgraded? (MM/YYYY)"
                                 },
                                 "dateLastEmptied": {
-                                  "ta6Ref": "12.7"
+                                  "ta6ed6v2Ref": "11.7d",
+                                  "title": "If a cesspool, when was the container last emptied? (MM/YYYY)"
+                                },
+                                "permitDocuments": {
+                                  "ta6ed6v2Ref": "11.7j",
+                                  "title": "If you have a permit or documents relating to any of your answers to questions 11.7(a)-(i), supply a copy"
                                 }
                               },
                               "required": [
-                                "dateReplaced",
+                                "dateDischargeCommenced",
+                                "dateInstalled",
                                 "dateLastEmptied"
                               ]
                             },
@@ -1932,12 +1918,31 @@
                                     "Cesspit"
                                   ]
                                 },
+                                "dateDischargeCommenced": {
+                                  "ta6ed6v2Ref": "11.7a",
+                                  "title": "When did the discharge commence? (MM/YYYY)"
+                                },
+                                "dateInstalled": {
+                                  "ta6ed6v2Ref": "11.7b",
+                                  "title": "When was the system installed? (MM/YYYY)"
+                                },
+                                "dateReplaced": {
+                                  "ta6ed6v2Ref": "11.7c",
+                                  "title": "When was the sewerage system last replaced or upgraded? (MM/YYYY)"
+                                },
                                 "dateLastEmptied": {
-                                  "ta6Ref": "12.7"
+                                  "ta6ed6v2Ref": "11.7d",
+                                  "title": "If a cesspool, when was the container last emptied? (MM/YYYY)"
+                                },
+                                "permitDocuments": {
+                                  "ta6ed6v2Ref": "11.7j",
+                                  "title": "If you have a permit or documents relating to any of your answers to questions 11.7(a)-(i), supply a copy"
                                 }
                               },
                               "required": [
-                                "dateLastEmptied"
+                                "dateDischargeCommenced",
+                                "dateLastEmptied",
+                                "dateInstalled"
                               ]
                             },
                             {
@@ -1947,16 +1952,45 @@
                                     "Sewerage treatment plant"
                                   ]
                                 },
+                                "dateDischargeCommenced": {
+                                  "ta6ed6v2Ref": "11.7a",
+                                  "title": "When did the discharge commence? (MM/YYYY)"
+                                },
+                                "supplier": {
+                                  "ta6ed6v2Ref": "12.5.2",
+                                  "title": "Provider's name"
+                                },
+                                "makeModel": {
+                                  "ta6ed6v2Ref": "12.5.3"
+                                },
+                                "serviceProviderName": {
+                                  "ta6ed6v2Ref": "12.5.4",
+                                  "title": "Service provider's name"
+                                },
                                 "dateInstalled": {
-                                  "ta6Ref": "12.9"
+                                  "ta6ed6v2Ref": "11.7b",
+                                  "title": "When was the system installed? (MM/YYYY)"
+                                },
+                                "dateReplaced": {
+                                  "ta6ed6v2Ref": "11.7c",
+                                  "title": "When was the sewerage system last replaced or upgraded? (MM/YYYY)"
                                 },
                                 "dateLastServiced": {
-                                  "ta6Ref": "12.8"
+                                  "ta6ed6v2Ref": "11.7e",
+                                  "title": "If the property is served by a sewage treatment plant, when was the treatment plant last serviced? (MM/YYYY)"
+                                },
+                                "permitDocuments": {
+                                  "ta6ed6v2Ref": "11.7j",
+                                  "title": "If you have a permit or documents relating to any of your answers to questions 11.7(a)-(i), supply a copy"
                                 }
                               },
                               "required": [
+                                "dateDischargeCommenced",
                                 "dateInstalled",
-                                "dateLastServiced"
+                                "dateLastServiced",
+                                "supplier",
+                                "makeModel",
+                                "serviceProviderName"
                               ]
                             },
                             {
@@ -1966,6 +2000,10 @@
                                     "Other",
                                     "Not known"
                                   ]
+                                },
+                                "permitDocuments": {
+                                  "ta6ed6v2Ref": "11.7j",
+                                  "title": "If you have a permit or documents relating to any of your answers to questions 11.7(a)-(i), supply a copy"
                                 }
                               }
                             }
@@ -1973,14 +2011,21 @@
                           "required": [
                             "offMainsDrainageSystemType",
                             "otherConnectedProperties",
-                            "plantOnOtherLand"
+                            "plantOnOtherLand",
+                            "plantDrainsIntoWaterway"
                           ],
                           "properties": {
                             "offMainsDrainageSystemType": {
-                              "ta6Ref": "12.5"
+                              "ta6ed6v2Ref": "11.6",
+                              "enum": [
+                                "Septic tank",
+                                "Cesspit",
+                                "Sewerage treatment plant",
+                                "Other"
+                              ]
                             },
                             "otherConnectedProperties": {
-                              "ta6Ref": "12.6",
+                              "ta6ed6v2Ref": "11.7h",
                               "discriminator": {
                                 "propertyName": "yesNo"
                               },
@@ -2001,26 +2046,28 @@
                                         "Yes"
                                       ]
                                     },
-                                    "numberOfPropertiesSharing": {
-                                      "ta6Ref": "12.6.2"
+                                    "details": {
+                                      "ta6ed6v2Ref": "11.7h",
+                                      "title": "Give details about how many properties share the system, the arrangements for jointly managing it and how the costs are shared"
                                     }
                                   },
                                   "required": [
-                                    "numberOfPropertiesSharing"
+                                    "details"
                                   ]
                                 }
                               ],
                               "required": [
                                 "yesNo"
                               ],
+                              "title": "Is the use of the sewerage system shared with other properties?",
                               "properties": {
                                 "yesNo": {
-                                  "ta6Ref": "12.6.1"
+                                  "ta6ed6v2Ref": "11.7h"
                                 }
                               }
                             },
                             "plantOnOtherLand": {
-                              "ta6Ref": "12.10",
+                              "ta6ed6v2Ref": "11.7i",
                               "discriminator": {
                                 "propertyName": "yesNo"
                               },
@@ -2042,7 +2089,8 @@
                                       ]
                                     },
                                     "attachments": {
-                                      "ta6Ref": "12.10.2"
+                                      "ta6ed6v2Ref": "11.7i",
+                                      "title": "Supply a plan showing the location of the system and how access is obtained."
                                     }
                                   },
                                   "required": [
@@ -2053,281 +2101,180 @@
                               "required": [
                                 "yesNo"
                               ],
-                              "title": "Is any part of the septic tank, sewage treatment plant (including any soakaway or outfall) or cesspool, or the access to it, outside the boundary of the property?",
+                              "title": "Is any part of the sewerage system, or the access to it, outside the boundary of the property?",
                               "properties": {
                                 "yesNo": {
-                                  "ta6Ref": "12.10.1"
+                                  "ta6ed6v2Ref": "11.7i"
                                 }
                               }
-                            }
-                          }
-                        }
-                      },
-                      "required": [
-                        "offMainsDrainageSystem"
-                      ]
-                    }
-                  ],
-                  "required": [
-                    "yesNo"
-                  ],
-                  "properties": {
-                    "yesNo": {
-                      "ta6Ref": "12.4a1",
-                      "enum": [
-                        "Yes",
-                        "No",
-                        "Not known"
-                      ]
-                    }
-                  }
-                }
-              }
-            }
-          }
-        },
-        "heating": {
-          "ta6Ref": "12.3",
-          "required": [
-            "heatingSystem"
-          ],
-          "properties": {
-            "heatingSystem": {
-              "ta6Ref": "12.3.1",
-              "discriminator": {
-                "propertyName": "heatingType"
-              },
-              "oneOf": [
-                {
-                  "properties": {
-                    "heatingType": {
-                      "enum": [
-                        "None",
-                        "Room heaters only"
-                      ]
-                    }
-                  }
-                },
-                {
-                  "properties": {
-                    "heatingType": {
-                      "enum": [
-                        "Central heating"
-                      ]
-                    },
-                    "centralHeatingDetails": {
-                      "ta6Ref": "12.3.2",
-                      "required": [
-                        "centralHeatingFuel",
-                        "centralHeatingInstalled",
-                        "boilerInstallationCertificate",
-                        "heatingLastServicedDate",
-                        "heatingLastServicedReport",
-                        "heatingInGoodWorkingOrder"
-                      ],
-                      "properties": {
-                        "centralHeatingFuel": {
-                          "ta6Ref": "12.3.3",
-                          "discriminator": {
-                            "propertyName": "centralHeatingFuelType"
-                          },
-                          "oneOf": [
-                            {
-                              "properties": {
-                                "centralHeatingFuelType": {
-                                  "enum": [
-                                    "Mains gas"
-                                  ]
-                                },
-                                "supplier": {
-                                  "ta6Ref": "13.2b"
-                                },
-                                "gasMeter": {
-                                  "ta6Ref": "13.2c",
-                                  "required": [
-                                    "location"
-                                  ],
+                            },
+                            "plantDrainsIntoWaterway": {
+                              "ta6ed6v2Ref": "11.7f",
+                              "discriminator": {
+                                "propertyName": "yesNo"
+                              },
+                              "oneOf": [
+                                {
                                   "properties": {
-                                    "location": {
-                                      "ta6Ref": "13.2c1"
+                                    "yesNo": {
+                                      "enum": [
+                                        "No, the effluent is discharged through a soakaway system."
+                                      ]
+                                    },
+                                    "hasInfiltrationSystem": {
+                                      "ta6ed6v2Ref": "11.7g",
+                                      "required": [
+                                        "yesNo"
+                                      ],
+                                      "title": "If the sewerage system discharges to the ground, does it have an infiltration system?",
+                                      "properties": {
+                                        "yesNo": {
+                                          "ta6ed6v2Ref": "11.7g"
+                                        }
+                                      }
                                     }
                                   }
-                                }
-                              },
-                              "required": [
-                                "supplier",
-                                "gasMeter"
-                              ]
-                            },
-                            {
-                              "properties": {
-                                "centralHeatingFuelType": {
-                                  "enum": [
-                                    "Electricity"
-                                  ]
-                                }
-                              }
-                            },
-                            {
-                              "properties": {
-                                "centralHeatingFuelType": {
-                                  "enum": [
-                                    "Oil",
-                                    "LPG",
-                                    "Biomass"
-                                  ]
-                                }
-                              }
-                            },
-                            {
-                              "properties": {
-                                "centralHeatingFuelType": {
-                                  "enum": [
-                                    "Other"
-                                  ]
-                                },
-                                "otherCentralHeatingFuelType": {
-                                  "ta6Ref": "12.3a2"
-                                }
-                              },
-                              "required": [
-                                "otherCentralHeatingFuelType"
-                              ]
-                            }
-                          ],
-                          "required": [
-                            "centralHeatingFuelType"
-                          ],
-                          "properties": {
-                            "centralHeatingFuelType": {
-                              "ta6Ref": "12.3a1"
-                            }
-                          }
-                        },
-                        "centralHeatingInstalled": {
-                          "ta6Ref": "12.3b1"
-                        },
-                        "boilerInstallationCertificate": {
-                          "ta6Ref": "12.3b2",
-                          "discriminator": {
-                            "propertyName": "yesNo"
-                          },
-                          "oneOf": [
-                            {
-                              "properties": {
-                                "yesNo": {
-                                  "enum": [
-                                    "No"
-                                  ]
-                                }
-                              }
-                            },
-                            {
-                              "properties": {
-                                "yesNo": {
-                                  "enum": [
-                                    "Yes"
-                                  ]
                                 },
-                                "attachments": {
-                                  "ta6Ref": "12.3b4"
-                                }
-                              },
-                              "required": [
-                                "attachments"
-                              ]
-                            }
-                          ],
-                          "required": [
-                            "yesNo"
-                          ],
-                          "properties": {
-                            "yesNo": {
-                              "ta6Ref": "12.3b3"
-                            }
-                          }
-                        },
-                        "heatingLastServicedDate": {
-                          "ta6Ref": "12.3d1"
-                        },
-                        "heatingLastServicedReport": {
-                          "ta6Ref": "12.3d2"
-                        },
-                        "heatingInGoodWorkingOrder": {
-                          "ta6Ref": "12.3c",
-                          "discriminator": {
-                            "propertyName": "yesNo"
-                          },
-                          "oneOf": [
-                            {
-                              "properties": {
-                                "yesNo": {
-                                  "enum": [
-                                    "Yes"
-                                  ]
+                                {
+                                  "properties": {
+                                    "yesNo": {
+                                      "enum": [
+                                        "Yes"
+                                      ]
+                                    }
+                                  }
                                 }
-                              }
-                            },
-                            {
+                              ],
+                              "required": [
+                                "yesNo"
+                              ],
+                              "title": "Does the sewerage system discharge to the ground or to surface water?",
                               "properties": {
                                 "yesNo": {
-                                  "enum": [
-                                    "No"
+                                  "ta6ed6v2Ref": "11.7f",
+                                  "enumNames": [
+                                    "Surface water",
+                                    "Ground"
                                   ]
                                 }
                               }
                             }
-                          ],
-                          "required": [
-                            "yesNo"
-                          ],
-                          "properties": {
-                            "yesNo": {
-                              "ta6Ref": "12.3c1",
-                              "enum": [
-                                "Yes",
-                                "No"
-                              ]
-                            }
                           }
                         }
-                      }
+                      },
+                      "required": [
+                        "offMainsDrainageSystem"
+                      ]
                     }
-                  },
+                  ],
                   "required": [
-                    "centralHeatingDetails"
-                  ]
-                },
-                {
+                    "yesNo"
+                  ],
+                  "title": "Foul water drainage?",
                   "properties": {
-                    "heatingType": {
+                    "yesNo": {
+                      "ta6ed6v2Ref": "11.5a1",
                       "enum": [
-                        "Communal heating system"
+                        "Yes",
+                        "No",
+                        "Not known"
                       ]
                     }
                   }
                 }
-              ],
-              "required": [
-                "heatingType"
-              ],
+              }
+            }
+          }
+        },
+        "heating": {
+          "ta6ed6v2Ref": "11.4",
+          "required": [
+            "mainHeatingTypes",
+            "heatingInstalledDate",
+            "boilerInstalledDate",
+            "heatingSystemReplaced",
+            "complianceCertificates",
+            "inspectionReport",
+            "inGoodWorkingOrder",
+            "lastServicedYear"
+          ],
+          "title": "Heating",
+          "properties": {
+            "mainHeatingTypes": {
+              "ta6ed6v2Ref": "11.4"
+            },
+            "mainHeatingTypesOtherDetails": {
+              "ta6ed6v2Ref": "11.4"
+            },
+            "heatingInstalledDate": {
+              "ta6ed6v2Ref": "11.4a"
+            },
+            "boilerInstalledDate": {
+              "ta6ed6v2Ref": "11.4b"
+            },
+            "heatingSystemReplaced": {
+              "ta6ed6v2Ref": "11.4c"
+            },
+            "complianceCertificates": {
+              "ta6ed6v2Ref": "11.4d"
+            },
+            "inspectionReport": {
+              "ta6ed6v2Ref": "11.4e"
+            },
+            "inGoodWorkingOrder": {
+              "ta6ed6v2Ref": "11.4f"
+            },
+            "lastServicedYear": {
+              "ta6ed6v2Ref": "11.4g"
+            },
+            "lastServicedReport": {
+              "ta6ed6v2Ref": "11.4g"
+            },
+            "multipleHeatingSystems": {
+              "ta6ed6v2Ref": "11.4h",
+              "enum": [
+                "Attached",
+                "To follow"
+              ]
+            },
+            "mainsGas": {
+              "ta6ed6v2Ref": "12.2",
               "properties": {
-                "heatingType": {
-                  "ta6Ref": "12.3.1"
+                "yesNo": {
+                  "ta6ed6v2Ref": "12.2.1"
+                },
+                "supplier": {
+                  "ta6ed6v2Ref": "12.2.2",
+                  "title": "Provider's name"
+                },
+                "gasMeter": {
+                  "ta6ed6v2Ref": "12.2.3",
+                  "properties": {
+                    "location": {
+                      "ta6ed6v2Ref": "12.2.3",
+                      "title": "Location of meter"
+                    },
+                    "mprn": {
+                      "ta6ed6v2Ref": "12.2.4",
+                      "title": "MPRN number",
+                      "description": "Your MPRN is on your gas bill, usually labelled 'Meter Point Reference Number' or 'MPRN'. It's normally between 6 and 10 digits long."
+                    }
+                  }
                 }
               }
             }
           }
         },
         "connectivity": {
-          "ta6Ref": "13",
+          "ta6ed6v2Ref": "12",
           "required": [
             "telephone",
-            "cableSatelliteTV"
+            "broadband"
           ],
+          "title": "Connection to services",
           "properties": {
             "telephone": {
-              "ta6Ref": "13.5",
+              "ta6ed6v2Ref": "12.7",
               "discriminator": {
                 "propertyName": "yesNo"
               },
@@ -2349,7 +2296,8 @@
                       ]
                     },
                     "supplier": {
-                      "ta6Ref": "13.5.2"
+                      "ta6ed6v2Ref": "12.7.2",
+                      "title": "Provider's name"
                     }
                   },
                   "required": [
@@ -2362,9 +2310,6 @@
                       "enum": [
                         "To be connected"
                       ]
-                    },
-                    "supplier": {
-                      "ta6Ref": "13.5.2"
                     }
                   }
                 }
@@ -2374,7 +2319,7 @@
               ],
               "properties": {
                 "yesNo": {
-                  "ta6Ref": "13.5.1",
+                  "ta6ed6v2Ref": "12.7.1",
                   "enum": [
                     "Yes",
                     "No"
@@ -2382,63 +2327,58 @@
                 }
               }
             },
-            "cableSatelliteTV": {
-              "ta6Ref": "13.6",
+            "broadband": {
+              "ta6ed6v2Ref": "12.8",
               "discriminator": {
-                "propertyName": "yesNo"
+                "propertyName": "typeOfConnection"
               },
               "oneOf": [
                 {
                   "properties": {
-                    "yesNo": {
+                    "typeOfConnection": {
                       "enum": [
-                        "No"
+                        "None"
                       ]
                     }
                   }
                 },
                 {
                   "properties": {
-                    "yesNo": {
+                    "typeOfConnection": {
                       "enum": [
-                        "Yes"
+                        "ADSL copper wire",
+                        "Cable",
+                        "FTTC (Fibre to the Cabinet)",
+                        "FTTP (Fibre to the Premises)"
                       ]
                     },
-                    "supplier": {
-                      "ta6Ref": "13.6.2"
+                    "providerName": {
+                      "ta6ed6v2Ref": "12.8.2",
+                      "title": "Provider's name"
                     }
                   },
                   "required": [
-                    "supplier"
+                    "providerName"
                   ]
-                },
-                {
-                  "properties": {
-                    "yesNo": {
-                      "enum": [
-                        "To be connected"
-                      ]
-                    }
-                  }
                 }
               ],
               "required": [
-                "yesNo"
+                "typeOfConnection"
               ],
               "properties": {
-                "yesNo": {
-                  "ta6Ref": "13.6.1",
-                  "enum": [
-                    "Yes",
-                    "No"
-                  ]
+                "typeOfConnection": {
+                  "ta6ed6v2Ref": "12.8.1"
                 }
               }
+            },
+            "otherServices": {
+              "ta6ed6v2Ref": "12.9.1",
+              "title": "If there are any other services, please give details"
             }
           }
         },
         "insurance": {
-          "ta6Ref": "6",
+          "ta6ed6v2Ref": "7",
           "discriminator": {
             "propertyName": "isInsured"
           },
@@ -2450,16 +2390,12 @@
                     "No"
                   ]
                 },
-                "details": {
-                  "ta6Ref": "6.2"
-                },
-                "landlordInsuresIfFlat": {
-                  "ta6Ref": "6.3"
+                "whoInsures": {
+                  "ta6ed6v2Ref": "7.1.1"
                 }
               },
               "required": [
-                "details",
-                "landlordInsuresIfFlat"
+                "whoInsures"
               ]
             },
             {
@@ -2470,7 +2406,7 @@
                   ]
                 },
                 "insuranceClaims": {
-                  "ta6Ref": "6.5",
+                  "ta6ed6v2Ref": "7.3",
                   "discriminator": {
                     "propertyName": "yesNo"
                   },
@@ -2492,7 +2428,8 @@
                           ]
                         },
                         "details": {
-                          "ta6Ref": "6.5.2"
+                          "ta6ed6v2Ref": "7.3.2",
+                          "title": "Give details, including the date(s) of any claim(s) and how they were resolved"
                         }
                       },
                       "required": [
@@ -2503,9 +2440,10 @@
                   "required": [
                     "yesNo"
                   ],
+                  "title": "Have you made any buildings insurance claims?",
                   "properties": {
                     "yesNo": {
-                      "ta6Ref": "6.5.1"
+                      "ta6ed6v2Ref": "7.3.1"
                     }
                   }
                 }
@@ -2516,22 +2454,22 @@
             }
           ],
           "required": [
-            "difficultiesObtainingInsurance",
-            "isInsured"
+            "isInsured",
+            "difficultiesObtainingInsurance"
           ],
           "properties": {
             "difficultiesObtainingInsurance": {
-              "ta6Ref": "6.4",
+              "ta6ed6v2Ref": "7.2",
               "required": [
                 "abnormalRiseInPremiums",
                 "subjectToHighExcesses",
                 "subjectToUnusualConditions",
                 "refused"
               ],
-              "title": "Has any buildings insurance taken out by the seller ever been:",
+              "title": "Are you aware of the property insurance ever being difficult to obtain or subject to special conditions?",
               "properties": {
                 "abnormalRiseInPremiums": {
-                  "ta6Ref": "6.4a",
+                  "ta6ed6v2Ref": "7.2a",
                   "discriminator": {
                     "propertyName": "yesNo"
                   },
@@ -2553,7 +2491,7 @@
                           ]
                         },
                         "details": {
-                          "ta6Ref": "6.4.2"
+                          "ta6ed6v2Ref": "7.2a2"
                         }
                       },
                       "required": [
@@ -2566,12 +2504,12 @@
                   ],
                   "properties": {
                     "yesNo": {
-                      "ta6Ref": "6.4a1"
+                      "ta6ed6v2Ref": "7.2a1"
                     }
                   }
                 },
                 "subjectToHighExcesses": {
-                  "ta6Ref": "6.4b",
+                  "ta6ed6v2Ref": "7.2b",
                   "discriminator": {
                     "propertyName": "yesNo"
                   },
@@ -2593,7 +2531,7 @@
                           ]
                         },
                         "details": {
-                          "ta6Ref": "6.4.2"
+                          "ta6ed6v2Ref": "7.2b2"
                         }
                       },
                       "required": [
@@ -2606,12 +2544,12 @@
                   ],
                   "properties": {
                     "yesNo": {
-                      "ta6Ref": "6.4b1"
+                      "ta6ed6v2Ref": "7.2b1"
                     }
                   }
                 },
                 "subjectToUnusualConditions": {
-                  "ta6Ref": "6.4c",
+                  "ta6ed6v2Ref": "7.2c",
                   "discriminator": {
                     "propertyName": "yesNo"
                   },
@@ -2633,7 +2571,7 @@
                           ]
                         },
                         "details": {
-                          "ta6Ref": "6.4.2"
+                          "ta6ed6v2Ref": "7.2c2"
                         }
                       },
                       "required": [
@@ -2646,12 +2584,12 @@
                   ],
                   "properties": {
                     "yesNo": {
-                      "ta6Ref": "6.4c1"
+                      "ta6ed6v2Ref": "7.2c1"
                     }
                   }
                 },
                 "refused": {
-                  "ta6Ref": "6.4d",
+                  "ta6ed6v2Ref": "7.2d",
                   "discriminator": {
                     "propertyName": "yesNo"
                   },
@@ -2673,7 +2611,7 @@
                           ]
                         },
                         "details": {
-                          "ta6Ref": "6.4.2"
+                          "ta6ed6v2Ref": "7.2d2"
                         }
                       },
                       "required": [
@@ -2686,29 +2624,30 @@
                   ],
                   "properties": {
                     "yesNo": {
-                      "ta6Ref": "6.4d1"
+                      "ta6ed6v2Ref": "7.2d1"
                     }
                   }
                 }
               }
             },
             "isInsured": {
-              "ta6Ref": "6.1",
-              "title": "Does the seller insure the property?"
+              "ta6ed6v2Ref": "7.1",
+              "title": "Do you insure the property?"
             }
           }
         },
         "rightsAndInformalArrangements": {
-          "ta6Ref": "8",
+          "ta6ed6v2Ref": "9",
           "required": [
-            "sharedContributions",
             "neighbouringLandRights",
-            "accessRestrictionAttempts",
-            "rightsOrArrangements"
+            "sharedContributions",
+            "rightsOrArrangements",
+            "askedOthersToContribute"
           ],
+          "title": "Rights and informal arrangements",
           "properties": {
             "sharedContributions": {
-              "ta6Ref": "8.1",
+              "ta6ed6v2Ref": "9.2",
               "discriminator": {
                 "propertyName": "yesNo"
               },
@@ -2717,7 +2656,8 @@
                   "properties": {
                     "yesNo": {
                       "enum": [
-                        "No"
+                        "No",
+                        "Not applicable"
                       ]
                     }
                   }
@@ -2730,7 +2670,8 @@
                       ]
                     },
                     "details": {
-                      "ta6Ref": "8.1.2"
+                      "ta6ed6v2Ref": "9.2.2",
+                      "title": "Please give details of how much, how often and who you pay"
                     }
                   },
                   "required": [
@@ -2741,14 +2682,16 @@
               "required": [
                 "yesNo"
               ],
+              "title": "Have you been asked to contribute towards the cost of the jointly used facilities?",
+              "description": "If yes, give details of how much, how often and who you pay:",
               "properties": {
                 "yesNo": {
-                  "ta6Ref": "8.1.1"
+                  "ta6ed6v2Ref": "9.2.1"
                 }
               }
             },
             "neighbouringLandRights": {
-              "ta6Ref": "8.2",
+              "ta6ed6v2Ref": "9.1",
               "discriminator": {
                 "propertyName": "yesNo"
               },
@@ -2770,77 +2713,107 @@
                       ]
                     },
                     "details": {
-                      "ta6Ref": "8.2.2"
+                      "ta6ed6v2Ref": "9.1.2",
+                      "title": "Please give details"
                     }
                   },
                   "required": [
-                    "details"
+                    "details",
+                    "disagreementOrComplaint"
                   ]
                 }
               ],
               "required": [
                 "yesNo"
               ],
+              "title": "Do you exercise any rights or arrangements over any other properties?",
               "properties": {
                 "yesNo": {
-                  "ta6Ref": "8.2.1"
+                  "ta6ed6v2Ref": "9.1.1"
+                },
+                "disagreementOrComplaint": {
+                  "ta6ed6v2Ref": "9.3",
+                  "discriminator": {
+                    "propertyName": "yesNo"
+                  },
+                  "oneOf": [
+                    {
+                      "properties": {
+                        "yesNo": {
+                          "enum": [
+                            "No",
+                            "Not known"
+                          ]
+                        }
+                      }
+                    },
+                    {
+                      "properties": {
+                        "yesNo": {
+                          "enum": [
+                            "Yes"
+                          ]
+                        },
+                        "details": {
+                          "ta6ed6v2Ref": "9.3.2"
+                        }
+                      },
+                      "required": [
+                        "details"
+                      ]
+                    }
+                  ],
+                  "required": [
+                    "yesNo"
+                  ],
+                  "properties": {
+                    "yesNo": {
+                      "ta6ed6v2Ref": "9.3.1"
+                    }
+                  }
                 }
               }
             },
             "accessRestrictionAttempts": {
-              "ta6Ref": "8.3",
-              "discriminator": {
-                "propertyName": "yesNo"
+              "properties": {
+                "yesNo": {
+                  "enum": [
+                    "Yes",
+                    "No",
+                    "Not known"
+                  ]
+                }
               },
               "oneOf": [
                 {
                   "properties": {
                     "yesNo": {
                       "enum": [
-                        "No"
+                        "No",
+                        "Not known"
                       ]
                     }
                   }
-                },
-                {
-                  "properties": {
-                    "yesNo": {
-                      "enum": [
-                        "Yes"
-                      ]
-                    },
-                    "details": {
-                      "ta6Ref": "8.3.2"
-                    }
-                  },
-                  "required": [
-                    "details"
-                  ]
-                }
-              ],
-              "required": [
-                "yesNo"
-              ],
-              "properties": {
-                "yesNo": {
-                  "ta6Ref": "8.3.1"
                 }
-              }
+              ]
             },
             "rightsOrArrangements": {
-              "ta6Ref": "8.4",
+              "ta6ed6v2Ref": "9.4",
               "required": [
+                "publicRightOfWay",
                 "rightsOfLight",
                 "rightsOfSupport",
                 "rightsCreatedThroughCustom",
                 "minesAndMinerals",
                 "churchChancel",
                 "rightsToTakeFromLand",
-                "otherRights"
+                "otherRights",
+                "disagreementOrComplaint"
               ],
+              "title": "Do the owners of any other properties exercise any rights or arrangements over the property?",
               "properties": {
                 "publicRightOfWay": {
-                  "ta6Ref": "8.6",
+                  "ta6ed6v2Ref": "9.4.1",
                   "discriminator": {
                     "propertyName": "yesNo"
                   },
@@ -2862,7 +2835,7 @@
                           ]
                         },
                         "details": {
-                          "ta6Ref": "8.6.2"
+                          "ta6ed6v2Ref": "9.4.1.2"
                         }
                       },
                       "required": [
@@ -2875,12 +2848,12 @@
                   ],
                   "properties": {
                     "yesNo": {
-                      "ta6Ref": "8.6.1"
+                      "ta6ed6v2Ref": "9.4.1.1"
                     }
                   }
                 },
                 "rightsOfLight": {
-                  "ta6Ref": "8.4a",
+                  "ta6ed6v2Ref": "9.4a",
                   "discriminator": {
                     "propertyName": "yesNo"
                   },
@@ -2900,8 +2873,14 @@
                           "enum": [
                             "Yes"
                           ]
+                        },
+                        "details": {
+                          "ta6ed6v2Ref": "9.4a2"
                         }
-                      }
+                      },
+                      "required": [
+                        "details"
+                      ]
                     }
                   ],
                   "required": [
@@ -2909,12 +2888,12 @@
                   ],
                   "properties": {
                     "yesNo": {
-                      "ta6Ref": "8.4a1"
+                      "ta6ed6v2Ref": "9.4a1"
                     }
                   }
                 },
                 "rightsOfSupport": {
-                  "ta6Ref": "8.4a",
+                  "ta6ed6v2Ref": "9.4b",
                   "discriminator": {
                     "propertyName": "yesNo"
                   },
@@ -2934,8 +2913,14 @@
                           "enum": [
                             "Yes"
                           ]
+                        },
+                        "details": {
+                          "ta6ed6v2Ref": "9.4b2"
                         }
-                      }
+                      },
+                      "required": [
+                        "details"
+                      ]
                     }
                   ],
                   "required": [
@@ -2943,12 +2928,12 @@
                   ],
                   "properties": {
                     "yesNo": {
-                      "ta6Ref": "8.4b1"
+                      "ta6ed6v2Ref": "9.4b1"
                     }
                   }
                 },
                 "rightsCreatedThroughCustom": {
-                  "ta6Ref": "8.4c",
+                  "ta6ed6v2Ref": "9.4c",
                   "discriminator": {
                     "propertyName": "yesNo"
                   },
@@ -2968,8 +2953,14 @@
                           "enum": [
                             "Yes"
                           ]
+                        },
+                        "details": {
+                          "ta6ed6v2Ref": "9.4c2"
                         }
-                      }
+                      },
+                      "required": [
+                        "details"
+                      ]
                     }
                   ],
                   "required": [
@@ -2977,12 +2968,12 @@
                   ],
                   "properties": {
                     "yesNo": {
-                      "ta6Ref": "8.4c1"
+                      "ta6ed6v2Ref": "9.4c1"
                     }
                   }
                 },
                 "rightsToTakeFromLand": {
-                  "ta6Ref": "8.5b",
+                  "ta6ed6v2Ref": "9.4d",
                   "discriminator": {
                     "propertyName": "yesNo"
                   },
@@ -3004,7 +2995,7 @@
                           ]
                         },
                         "details": {
-                          "ta6Ref": "8.5c2"
+                          "ta6ed6v2Ref": "9.4d2"
                         }
                       },
                       "required": [
@@ -3017,12 +3008,12 @@
                   ],
                   "properties": {
                     "yesNo": {
-                      "ta6Ref": "8.5c1"
+                      "ta6ed6v2Ref": "9.4d1"
                     }
                   }
                 },
                 "minesAndMinerals": {
-                  "ta6Ref": "8.5a",
+                  "ta6ed6v2Ref": "9.4e",
                   "discriminator": {
                     "propertyName": "yesNo"
                   },
@@ -3042,8 +3033,14 @@
                           "enum": [
                             "Yes"
                           ]
+                        },
+                        "details": {
+                          "ta6ed6v2Ref": "9.4e2"
                         }
-                      }
+                      },
+                      "required": [
+                        "details"
+                      ]
                     }
                   ],
                   "required": [
@@ -3051,12 +3048,12 @@
                   ],
                   "properties": {
                     "yesNo": {
-                      "ta6Ref": "8.5a1"
+                      "ta6ed6v2Ref": "9.4e1"
                     }
                   }
                 },
                 "churchChancel": {
-                  "ta6Ref": "8.5b",
+                  "ta6ed6v2Ref": "9.4f",
                   "discriminator": {
                     "propertyName": "yesNo"
                   },
@@ -3076,8 +3073,14 @@
                           "enum": [
                             "Yes"
                           ]
+                        },
+                        "details": {
+                          "ta6ed6v2Ref": "9.4f2"
                         }
-                      }
+                      },
+                      "required": [
+                        "details"
+                      ]
                     }
                   ],
                   "required": [
@@ -3085,12 +3088,12 @@
                   ],
                   "properties": {
                     "yesNo": {
-                      "ta6Ref": "8.5b1"
+                      "ta6ed6v2Ref": "9.4f1"
                     }
                   }
                 },
                 "otherRights": {
-                  "ta6Ref": "8.6",
+                  "ta6ed6v2Ref": "9.4g",
                   "discriminator": {
                     "propertyName": "yesNo"
                   },
@@ -3112,50 +3115,135 @@
                           ]
                         },
                         "details": {
-                          "ta6Ref": "8.6.2"
+                          "ta6ed6v2Ref": "9.4g2"
+                        }
+                      },
+                      "required": [
+                        "details"
+                      ]
+                    }
+                  ],
+                  "required": [
+                    "yesNo"
+                  ],
+                  "properties": {
+                    "yesNo": {
+                      "ta6ed6v2Ref": "9.4g1"
+                    }
+                  }
+                },
+                "disagreementOrComplaint": {
+                  "ta6ed6v2Ref": "9.6",
+                  "discriminator": {
+                    "propertyName": "yesNo"
+                  },
+                  "oneOf": [
+                    {
+                      "properties": {
+                        "yesNo": {
+                          "enum": [
+                            "No",
+                            "Not known"
+                          ]
+                        }
+                      }
+                    },
+                    {
+                      "properties": {
+                        "yesNo": {
+                          "enum": [
+                            "Yes"
+                          ]
+                        },
+                        "details": {
+                          "ta6ed6v2Ref": "9.6.2",
+                          "title": "Please give details"
                         }
                       },
                       "required": [
                         "details"
                       ]
                     }
-                  ],
-                  "required": [
-                    "yesNo"
-                  ],
+                  ],
+                  "required": [
+                    "yesNo"
+                  ],
+                  "title": "Are you aware of any disagreement or complaint about any such right or arrangement?",
+                  "properties": {
+                    "yesNo": {
+                      "ta6ed6v2Ref": "9.6.1"
+                    }
+                  }
+                }
+              }
+            },
+            "askedOthersToContribute": {
+              "ta6ed6v2Ref": "9.5",
+              "discriminator": {
+                "propertyName": "yesNo"
+              },
+              "oneOf": [
+                {
+                  "properties": {
+                    "yesNo": {
+                      "enum": [
+                        "No",
+                        "Not applicable"
+                      ]
+                    }
+                  }
+                },
+                {
                   "properties": {
                     "yesNo": {
-                      "ta6Ref": "8.6.1"
+                      "enum": [
+                        "Yes"
+                      ]
+                    },
+                    "details": {
+                      "ta6ed6v2Ref": "9.5.2"
                     }
-                  }
+                  },
+                  "required": [
+                    "details"
+                  ]
+                }
+              ],
+              "required": [
+                "yesNo"
+              ],
+              "properties": {
+                "yesNo": {
+                  "ta6ed6v2Ref": "9.5.1"
                 }
               }
             }
           }
         },
         "environmentalIssues": {
-          "ta6Ref": "7",
+          "ta6ed6v2Ref": "8",
           "required": [
             "flooding",
             "radon"
           ],
+          "title": "Environmental matters",
           "properties": {
             "flooding": {
-              "ta6Ref": "7",
+              "ta6ed6v2Ref": "8",
               "required": [
-                "floodRiskReport",
-                "historicalFlooding"
+                "historicalFlooding",
+                "floodDefences"
               ],
               "properties": {
-                "floodRiskReport": {
-                  "ta6Ref": "7.3",
+                "historicalFlooding": {
+                  "ta6ed6v2Ref": "8.1",
                   "discriminator": {
-                    "propertyName": "hasReportBeenPrepared"
+                    "propertyName": "hasBeenFlooded"
                   },
                   "oneOf": [
                     {
                       "properties": {
-                        "hasReportBeenPrepared": {
+                        "hasBeenFlooded": {
                           "enum": [
                             "No"
                           ]
@@ -3164,85 +3252,94 @@
                     },
                     {
                       "properties": {
-                        "hasReportBeenPrepared": {
+                        "hasBeenFlooded": {
                           "enum": [
                             "Yes"
                           ]
                         },
-                        "attachments": {
-                          "ta6Ref": "7.3.2"
+                        "typeOfFlooding": {
+                          "ta6ed6v2Ref": "8.1",
+                          "title": "What type of flooding took place?"
+                        },
+                        "details": {
+                          "ta6ed6v2Ref": "8.1.2",
+                          "title": "Give details about the date(s) any flooding occurred and which parts flooded"
                         }
                       },
                       "required": [
-                        "attachments"
+                        "typeOfFlooding",
+                        "details"
                       ]
                     }
                   ],
                   "required": [
-                    "hasReportBeenPrepared"
+                    "hasBeenFlooded"
                   ],
+                  "title": "Are you aware of the property or any part of it ever being flooded?",
+                  "description": "If yes, what type of flooding took place?",
                   "properties": {
-                    "hasReportBeenPrepared": {
-                      "ta6Ref": "7.3.1"
+                    "hasBeenFlooded": {
+                      "ta6ed6v2Ref": "8.1.1",
+                      "title": "Are you aware of the property or any part of it ever being flooded?"
                     }
                   }
                 },
-                "historicalFlooding": {
-                  "ta6Ref": "7.1",
+                "floodDefences": {
+                  "ta6ed6v2Ref": "8.2",
                   "discriminator": {
-                    "propertyName": "hasBeenFlooded"
+                    "propertyName": "hasFloodDefences"
                   },
                   "oneOf": [
                     {
                       "properties": {
-                        "hasBeenFlooded": {
+                        "hasFloodDefences": {
                           "enum": [
-                            "No"
+                            "No",
+                            "Not known"
                           ]
                         }
                       }
                     },
                     {
                       "properties": {
-                        "hasBeenFlooded": {
+                        "hasFloodDefences": {
                           "enum": [
                             "Yes"
                           ]
                         },
-                        "typeOfFlooding": {
-                          "ta6Ref": "7.2"
-                        },
                         "details": {
-                          "ta6Ref": "7.1.2"
+                          "ta6ed6v2Ref": "8.2.2",
+                          "title": "Please give details"
                         }
                       },
                       "required": [
-                        "typeOfFlooding",
                         "details"
                       ]
                     }
                   ],
                   "required": [
-                    "hasBeenFlooded"
+                    "hasFloodDefences"
                   ],
+                  "title": "Are you aware of any defences installed at the property to prevent flooding?",
+                  "description": "If yes, please give details:",
                   "properties": {
-                    "hasBeenFlooded": {
-                      "ta6Ref": "7.1.1",
-                      "title": "Has any part of the property (whether buildings or surrounding garden or land) ever been flooded?"
+                    "hasFloodDefences": {
+                      "ta6ed6v2Ref": "8.2.1",
+                      "title": "Are you aware of any defences installed at the property to prevent flooding?"
                     }
                   }
                 }
               }
             },
             "radon": {
-              "ta6Ref": "7.4",
+              "ta6ed6v2Ref": "8.3",
               "required": [
                 "remedialMeasuresOnConstruction",
                 "radonTest"
               ],
               "properties": {
                 "radonTest": {
-                  "ta6Ref": "7.4",
+                  "ta6ed6v2Ref": "8.3",
                   "discriminator": {
                     "propertyName": "yesNo"
                   },
@@ -3265,10 +3362,12 @@
                           ]
                         },
                         "details": {
-                          "ta6Ref": "7.4b"
+                          "ta6ed6v2Ref": "8.3.1a",
+                          "title": "Was the test result below the 'recommended action level'?"
                         },
                         "attachments": {
-                          "ta6Ref": "7.4a"
+                          "ta6ed6v2Ref": "8.3.1b",
+                          "title": "Supply a copy of the report"
                         }
                       },
                       "required": [
@@ -3280,24 +3379,23 @@
                   "required": [
                     "yesNo"
                   ],
+                  "title": "Are you aware of any radon tests that have been carried out on the property?",
                   "properties": {
                     "yesNo": {
-                      "ta6Ref": "7.4.1",
-                      "enum": [
-                        "Yes",
-                        "No"
-                      ]
+                      "ta6ed6v2Ref": "8.3.1"
                     }
                   }
                 },
                 "remedialMeasuresOnConstruction": {
-                  "ta6Ref": "7.5",
+                  "ta6ed6v2Ref": "8.4",
                   "required": [
                     "yesNo"
                   ],
+                  "title": "Were any remedial measures undertaken to reduce radon gas levels in the property? Measures could have been undertaken during construction or while adding an extension.",
+                  "description": "Measures could have been undertaken during construction or while adding an extension.",
                   "properties": {
                     "yesNo": {
-                      "ta6Ref": "7.5.1"
+                      "ta6ed6v2Ref": "8.4.1"
                     }
                   }
                 }
@@ -3306,140 +3404,97 @@
           }
         },
         "additionalInformation": {
-          "ta6Ref": "10",
+          "ta6ed6v2Ref": "15",
           "required": [
-            "otherCharges"
+            "consents",
+            "furtherInformation"
           ],
+          "title": "Additional information about your answers",
           "properties": {
-            "otherCharges": {
-              "ta6Ref": "10.1",
-              "discriminator": {
-                "propertyName": "yesNo"
-              },
-              "oneOf": [
-                {
-                  "properties": {
-                    "yesNo": {
-                      "enum": [
-                        "No"
-                      ]
-                    }
-                  }
+            "consents": {
+              "ta6ed6v2Ref": "15.1",
+              "properties": {
+                "attachments": {
+                  "ta6ed6v2Ref": "15.1.1"
                 },
-                {
-                  "properties": {
-                    "yesNo": {
-                      "enum": [
-                        "Yes"
-                      ]
-                    },
-                    "details": {
-                      "ta6Ref": "10.1.2"
-                    }
-                  },
-                  "required": [
-                    "details"
-                  ]
+                "consentsAttached": {
+                  "ta6ed6v2Ref": "15.1.2",
+                  "title": "Consents attached"
+                },
+                "consentsToFollow": {
+                  "ta6ed6v2Ref": "15.1.3",
+                  "title": "Consents to follow"
+                },
+                "consentsNotAvailable": {
+                  "ta6ed6v2Ref": "15.1.4"
                 }
-              ],
-              "required": [
-                "yesNo"
-              ],
+              }
+            },
+            "furtherInformation": {
+              "ta6ed6v2Ref": "15.2",
+              "title": "If there is any further information about any of your answers on this form, provide details below and/or supply additional documents.",
               "properties": {
-                "yesNo": {
-                  "ta6Ref": "10.1.1"
+                "details": {
+                  "ta6ed6v2Ref": "15.2.1"
+                },
+                "attachments": {
+                  "ta6ed6v2Ref": "15.2.2"
                 }
               }
             }
           }
         },
         "legalBoundaries": {
-          "ta6Ref": "1",
+          "ta6ed6v2Ref": "2",
           "required": [
             "ownership",
             "haveBoundaryFeaturesMoved",
-            "adjacentLandIncluded",
             "flyingFreehold"
           ],
+          "title": "Boundaries",
           "properties": {
             "ownership": {
-              "ta6Ref": "1",
-              "discriminator": {
-                "propertyName": "areBoundariesUniform"
-              },
-              "oneOf": [
-                {
+              "ta6ed6v2Ref": "2",
+              "properties": {
+                "uniformBoundaries": {
+                  "ta6ed6v2Ref": "2.1",
+                  "required": [
+                    "left",
+                    "right",
+                    "rear",
+                    "front"
+                  ],
+                  "title": "Looking towards the property from the road, who owns or accepts responsibility to maintain or repair the boundary features",
                   "properties": {
-                    "areBoundariesUniform": {
-                      "enum": [
-                        "Yes"
-                      ]
+                    "left": {
+                      "ta6ed6v2Ref": "2.1a",
+                      "title": "On the left?"
                     },
-                    "uniformBoundaries": {
-                      "ta6Ref": "1.1",
-                      "required": [
-                        "left",
-                        "right",
-                        "rear",
-                        "front"
-                      ],
-                      "properties": {
-                        "left": {
-                          "ta6Ref": "1.1a"
-                        },
-                        "right": {
-                          "ta6Ref": "1.1b"
-                        },
-                        "rear": {
-                          "ta6Ref": "1.1c"
-                        },
-                        "front": {
-                          "ta6Ref": "1.1d"
-                        }
-                      }
-                    }
-                  }
-                },
-                {
-                  "properties": {
-                    "areBoundariesUniform": {
-                      "enum": [
-                        "No"
-                      ]
+                    "right": {
+                      "ta6ed6v2Ref": "2.1b",
+                      "title": "On the right?"
                     },
-                    "details": {
-                      "ta6Ref": "1.2.1"
+                    "rear": {
+                      "ta6ed6v2Ref": "2.1c",
+                      "title": "At the rear?"
                     },
-                    "attachments": {
-                      "ta6Ref": "1.2.2"
-                    }
-                  },
-                  "required": [
-                    "details",
-                    "attachments"
-                  ]
-                },
-                {
-                  "properties": {
-                    "areBoundariesUniform": {
-                      "enum": [
-                        "Not applicable"
-                      ]
+                    "front": {
+                      "ta6ed6v2Ref": "2.1d",
+                      "title": "At the front?"
                     }
                   }
-                }
-              ],
-              "required": [
-                "areBoundariesUniform"
-              ],
-              "properties": {
-                "areBoundariesUniform": {
-                  "ta6Ref": "1.2"
+                },
+                "details": {
+                  "ta6ed6v2Ref": "2.2.1",
+                  "title": "If the boundaries of the property are irregular, indicate ownership by written description or by reference to a plan"
+                },
+                "attachments": {
+                  "ta6ed6v2Ref": "2.2"
                 }
               }
             },
             "haveBoundaryFeaturesMoved": {
-              "ta6Ref": "1.3",
+              "ta6ed6v2Ref": "2.3",
               "discriminator": {
                 "propertyName": "yesNo"
               },
@@ -3448,8 +3503,7 @@
                   "properties": {
                     "yesNo": {
                       "enum": [
-                        "No",
-                        "Not applicable"
+                        "No"
                       ]
                     }
                   }
@@ -3462,7 +3516,8 @@
                       ]
                     },
                     "details": {
-                      "ta6Ref": "1.3.2"
+                      "ta6ed6v2Ref": "2.3.2",
+                      "title": "Please give details"
                     }
                   },
                   "required": [
@@ -3473,57 +3528,20 @@
               "required": [
                 "yesNo"
               ],
-              "title": "Is the seller aware of any boundary feature having been moved in the last 10 years or during the seller's period of ownership if longer?",
+              "title": "Are you aware of any boundary feature being moved, any adjacent land being added to the property, or any neighbour taking over or building on any part of your property?",
+              "description": "If yes, please give details:",
               "properties": {
                 "yesNo": {
-                  "ta6Ref": "1.3.1"
-                }
-              }
-            },
-            "adjacentLandIncluded": {
-              "ta6Ref": "1.4",
-              "discriminator": {
-                "propertyName": "yesNo"
-              },
-              "oneOf": [
-                {
-                  "properties": {
-                    "yesNo": {
-                      "enum": [
-                        "No",
-                        "Not applicable"
-                      ]
-                    }
-                  }
-                },
-                {
-                  "properties": {
-                    "yesNo": {
-                      "enum": [
-                        "Yes"
-                      ]
-                    },
-                    "details": {
-                      "ta6Ref": "1.4.2"
-                    }
-                  },
-                  "required": [
-                    "details"
+                  "ta6ed6v2Ref": "2.3.1",
+                  "enum": [
+                    "Yes",
+                    "No"
                   ]
                 }
-              ],
-              "required": [
-                "yesNo"
-              ],
-              "title": "During the seller's ownership, has any adjacent land or property been purchased by the seller?",
-              "properties": {
-                "yesNo": {
-                  "ta6Ref": "1.4.1"
-                }
               }
             },
             "flyingFreehold": {
-              "ta6Ref": "1.5",
+              "ta6ed6v2Ref": "2.4",
               "discriminator": {
                 "propertyName": "yesNo"
               },
@@ -3533,7 +3551,7 @@
                     "yesNo": {
                       "enum": [
                         "No",
-                        "Not applicable"
+                        "Not known"
                       ]
                     }
                   }
@@ -3546,7 +3564,8 @@
                       ]
                     },
                     "details": {
-                      "ta6Ref": "1.5.2"
+                      "ta6ed6v2Ref": "2.4.2",
+                      "title": "Please give details"
                     }
                   },
                   "required": [
@@ -3557,25 +3576,32 @@
               "required": [
                 "yesNo"
               ],
-              "title": "Does any part of the property or any building on the property overhang, or project under, the boundary of the neighbouring property or road, for example cellars under the pavement, overhanging eaves or covered walkways?",
+              "title": "Does any part of the property or any building on the property overhang or project under the boundary of the neighbouring property or road? For example, cellars under the pavement, overhanging eaves or covered walkways.",
+              "description": "If yes, please give details:",
               "properties": {
                 "yesNo": {
-                  "ta6Ref": "1.5.1"
+                  "ta6ed6v2Ref": "2.4.1",
+                  "enum": [
+                    "Yes",
+                    "No",
+                    "Not known"
+                  ]
                 }
               }
             }
           }
         },
         "servicesCrossing": {
-          "ta6Ref": "8",
+          "ta6ed6v2Ref": "9",
           "required": [
             "pipesWiresCablesDrainsToProperty",
             "pipesWiresCablesDrainsFromProperty",
             "formalOrInformalAgreements"
           ],
+          "title": "Facilities crossing the property or any other property",
           "properties": {
             "pipesWiresCablesDrainsToProperty": {
-              "ta6Ref": "8.7",
+              "ta6ed6v2Ref": "9.7",
               "discriminator": {
                 "propertyName": "yesNo"
               },
@@ -3598,7 +3624,8 @@
                       ]
                     },
                     "details": {
-                      "ta6Ref": "8.7.2"
+                      "ta6ed6v2Ref": "9.7.2",
+                      "title": "Please give details"
                     }
                   },
                   "required": [
@@ -3609,15 +3636,15 @@
               "required": [
                 "yesNo"
               ],
-              "title": "Do any drains, pipes or wires serving the property cross any neighbour's property?",
+              "title": "Are you aware of any drains, pipes or wires serving the property that cross any other property?",
               "properties": {
                 "yesNo": {
-                  "ta6Ref": "8.7.1"
+                  "ta6ed6v2Ref": "9.7.1"
                 }
               }
             },
             "pipesWiresCablesDrainsFromProperty": {
-              "ta6Ref": "8.8",
+              "ta6ed6v2Ref": "9.8",
               "discriminator": {
                 "propertyName": "yesNo"
               },
@@ -3640,7 +3667,8 @@
                       ]
                     },
                     "details": {
-                      "ta6Ref": "8.8.2"
+                      "ta6ed6v2Ref": "9.8.2",
+                      "title": "Please give details"
                     }
                   },
                   "required": [
@@ -3651,14 +3679,15 @@
               "required": [
                 "yesNo"
               ],
+              "title": "Are you aware of any drains, pipes or wires leading to any other property that cross the property?",
               "properties": {
                 "yesNo": {
-                  "ta6Ref": "8.8.1"
+                  "ta6ed6v2Ref": "9.8.1"
                 }
               }
             },
             "formalOrInformalAgreements": {
-              "ta6Ref": "8.9",
+              "ta6ed6v2Ref": "9.9",
               "discriminator": {
                 "propertyName": "yesNo"
               },
@@ -3681,10 +3710,11 @@
                       ]
                     },
                     "details": {
-                      "ta6Ref": "8.9.2"
+                      "ta6ed6v2Ref": "9.9.2",
+                      "title": "Supply a copy or give details"
                     },
                     "attachments": {
-                      "ta6Ref": "8.9.3"
+                      "ta6ed6v2Ref": "9.9.3"
                     }
                   },
                   "required": [
@@ -3698,21 +3728,22 @@
               "title": "Is there any agreement or arrangement about drains, pipes or wires?",
               "properties": {
                 "yesNo": {
-                  "ta6Ref": "8.9.1"
+                  "ta6ed6v2Ref": "9.9.1"
                 }
               }
             }
           }
         },
         "electricalWorks": {
-          "ta6Ref": "12",
+          "ta6ed6v2Ref": "11",
           "required": [
             "testedByQualifiedElectrician",
             "electricalWorkSince2005"
           ],
+          "title": "Electrical systems",
           "properties": {
             "testedByQualifiedElectrician": {
-              "ta6Ref": "12.1",
+              "ta6ed6v2Ref": "11.3",
               "discriminator": {
                 "propertyName": "yesNo"
               },
@@ -3734,10 +3765,11 @@
                       ]
                     },
                     "yearTested": {
-                      "ta6Ref": "12.1.2"
+                      "ta6ed6v2Ref": "11.3"
                     },
                     "attachments": {
-                      "ta6Ref": "12.1.3",
+                      "ta6ed6v2Ref": "11.3",
+                      "title": "Please supply a copy of the EICR",
                       "enum": [
                         "Attached",
                         "To follow"
@@ -3753,14 +3785,15 @@
               "required": [
                 "yesNo"
               ],
+              "title": "Does the property have an Electrical Installation Condition Report (EICR)?",
               "properties": {
                 "yesNo": {
-                  "ta6Ref": "12.1.1"
+                  "ta6ed6v2Ref": "11.3"
                 }
               }
             },
             "electricalWorkSince2005": {
-              "ta6Ref": "12.2",
+              "ta6ed6v2Ref": "11.1",
               "discriminator": {
                 "propertyName": "yesNo"
               },
@@ -3782,18 +3815,22 @@
                         "Yes"
                       ]
                     },
+                    "yearWorkCarriedOut": {
+                      "ta6ed6v2Ref": "11.2"
+                    },
+                    "details": {
+                      "ta6ed6v2Ref": "11.1",
+                      "title": "Give details including when this work took place"
+                    },
                     "suppliedCertificate": {
-                      "ta6Ref": "12.2.2a",
-                      "required": [
-                        "certificateType",
-                        "attachments"
-                      ],
+                      "ta6ed6v2Ref": "11.2",
+                      "title": "Please supply any certificates for electrical installation work",
                       "properties": {
-                        "certificateType": {
-                          "ta6Ref": "12.2.2a.1"
+                        "yesNo": {
+                          "ta6ed6v2Ref": "11.2.1"
                         },
                         "attachments": {
-                          "ta6Ref": "12.2.2a.2",
+                          "ta6ed6v2Ref": "11.2.2",
                           "enum": [
                             "Attached",
                             "To follow"
@@ -3803,6 +3840,7 @@
                     }
                   },
                   "required": [
+                    "details",
                     "suppliedCertificate"
                   ]
                 }
@@ -3810,16 +3848,17 @@
               "required": [
                 "yesNo"
               ],
+              "title": "Are you aware of any electrical installation works carried out at the property?",
               "properties": {
                 "yesNo": {
-                  "ta6Ref": "12.2.1"
+                  "ta6ed6v2Ref": "11.1"
                 }
               }
             }
           }
         },
         "guaranteesWarrantiesAndIndemnityInsurances": {
-          "ta6Ref": "5",
+          "ta6ed6v2Ref": "6",
           "discriminator": {
             "propertyName": "hasValidGuaranteesOrWarranties"
           },
@@ -3841,7 +3880,7 @@
                   ]
                 },
                 "newHomeWarranty": {
-                  "ta6Ref": "5.1a",
+                  "ta6ed6v2Ref": "6.1a",
                   "discriminator": {
                     "propertyName": "yesNo"
                   },
@@ -3862,11 +3901,8 @@
                             "Yes"
                           ]
                         },
-                        "details": {
-                          "ta6Ref": "5.1a2"
-                        },
                         "attachments": {
-                          "ta6Ref": "5.1a3"
+                          "ta6ed6v2Ref": "6.1a3"
                         }
                       },
                       "required": [
@@ -3877,14 +3913,15 @@
                   "required": [
                     "yesNo"
                   ],
+                  "title": "New home warranty (e.g. NHBC or similar)",
                   "properties": {
                     "yesNo": {
-                      "ta6Ref": "5.1a1"
+                      "ta6ed6v2Ref": "6.1a1"
                     }
                   }
                 },
                 "roofingWork": {
-                  "ta6Ref": "5.1f",
+                  "ta6ed6v2Ref": "6.1e",
                   "discriminator": {
                     "propertyName": "yesNo"
                   },
@@ -3906,7 +3943,7 @@
                           ]
                         },
                         "attachments": {
-                          "ta6Ref": "5.1f2"
+                          "ta6ed6v2Ref": "6.1e2"
                         }
                       },
                       "required": [
@@ -3917,14 +3954,15 @@
                   "required": [
                     "yesNo"
                   ],
+                  "title": "Roofing",
                   "properties": {
                     "yesNo": {
-                      "ta6Ref": "5.1f1"
+                      "ta6ed6v2Ref": "6.1e1"
                     }
                   }
                 },
                 "dampProofingTreatment": {
-                  "ta6Ref": "5.1b",
+                  "ta6ed6v2Ref": "6.1b",
                   "discriminator": {
                     "propertyName": "yesNo"
                   },
@@ -3946,7 +3984,7 @@
                           ]
                         },
                         "attachments": {
-                          "ta6Ref": "5.1b2"
+                          "ta6ed6v2Ref": "6.1b2"
                         }
                       },
                       "required": [
@@ -3957,14 +3995,15 @@
                   "required": [
                     "yesNo"
                   ],
+                  "title": "Damp proofing",
                   "properties": {
                     "yesNo": {
-                      "ta6Ref": "5.1b1"
+                      "ta6ed6v2Ref": "6.1b1"
                     }
                   }
                 },
                 "timberRotOrInfestationTreatment": {
-                  "ta6Ref": "5.1c",
+                  "ta6ed6v2Ref": "6.1c",
                   "discriminator": {
                     "propertyName": "yesNo"
                   },
@@ -3986,7 +4025,7 @@
                           ]
                         },
                         "attachments": {
-                          "ta6Ref": "5.1c2"
+                          "ta6ed6v2Ref": "6.1c2"
                         }
                       },
                       "required": [
@@ -3997,14 +4036,15 @@
                   "required": [
                     "yesNo"
                   ],
+                  "title": "Timber treatment",
                   "properties": {
                     "yesNo": {
-                      "ta6Ref": "5.1c1"
+                      "ta6ed6v2Ref": "6.1c1"
                     }
                   }
                 },
                 "centralHeatingAndorPlumbing": {
-                  "ta6Ref": "5.1g",
+                  "ta6ed6v2Ref": "6.1f",
                   "discriminator": {
                     "propertyName": "yesNo"
                   },
@@ -4026,7 +4066,7 @@
                           ]
                         },
                         "attachments": {
-                          "ta6Ref": "5.1g2"
+                          "ta6ed6v2Ref": "6.1f2"
                         }
                       },
                       "required": [
@@ -4037,14 +4077,15 @@
                   "required": [
                     "yesNo"
                   ],
+                  "title": "Boiler or heating systems",
                   "properties": {
                     "yesNo": {
-                      "ta6Ref": "5.1g1"
+                      "ta6ed6v2Ref": "6.1f1"
                     }
                   }
                 },
                 "doubleGlazing": {
-                  "ta6Ref": "5.1d",
+                  "ta6ed6v2Ref": "6.1d",
                   "discriminator": {
                     "propertyName": "yesNo"
                   },
@@ -4066,7 +4107,7 @@
                           ]
                         },
                         "attachments": {
-                          "ta6Ref": "5.1d2"
+                          "ta6ed6v2Ref": "6.1d2"
                         }
                       },
                       "required": [
@@ -4077,14 +4118,15 @@
                   "required": [
                     "yesNo"
                   ],
+                  "title": "Windows, roof lights, roof windows or glazed doors",
                   "properties": {
                     "yesNo": {
-                      "ta6Ref": "5.1d1"
+                      "ta6ed6v2Ref": "6.1d1"
                     }
                   }
                 },
-                "electricalRepairOrInstallation": {
-                  "ta6Ref": "5.1e",
+                "subsidenceWork": {
+                  "ta6ed6v2Ref": "6.1g",
                   "discriminator": {
                     "propertyName": "yesNo"
                   },
@@ -4106,7 +4148,7 @@
                           ]
                         },
                         "attachments": {
-                          "ta6Ref": "5.1e2"
+                          "ta6ed6v2Ref": "6.1g2"
                         }
                       },
                       "required": [
@@ -4117,14 +4159,15 @@
                   "required": [
                     "yesNo"
                   ],
+                  "title": "Underpinning",
                   "properties": {
                     "yesNo": {
-                      "ta6Ref": "5.1e1"
+                      "ta6ed6v2Ref": "6.1g1"
                     }
                   }
                 },
-                "subsidenceWork": {
-                  "ta6Ref": "5.1h",
+                "insulation": {
+                  "ta6ed6v2Ref": "6.1h",
                   "discriminator": {
                     "propertyName": "yesNo"
                   },
@@ -4146,7 +4189,7 @@
                           ]
                         },
                         "attachments": {
-                          "ta6Ref": "5.1h2"
+                          "ta6ed6v2Ref": "6.1h2"
                         }
                       },
                       "required": [
@@ -4159,12 +4202,12 @@
                   ],
                   "properties": {
                     "yesNo": {
-                      "ta6Ref": "5.1h1"
+                      "ta6ed6v2Ref": "6.1h1"
                     }
                   }
                 },
                 "otherGuarantees": {
-                  "ta6Ref": "5.1i",
+                  "ta6ed6v2Ref": "6.1i",
                   "discriminator": {
                     "propertyName": "yesNo"
                   },
@@ -4186,10 +4229,11 @@
                           ]
                         },
                         "details": {
-                          "ta6Ref": "5.1i2"
+                          "ta6ed6v2Ref": "6.1i2",
+                          "title": "Please give details"
                         },
                         "attachments": {
-                          "ta6Ref": "5.1i3"
+                          "ta6ed6v2Ref": "6.1i3"
                         }
                       },
                       "required": [
@@ -4201,14 +4245,15 @@
                   "required": [
                     "yesNo"
                   ],
+                  "title": "Other (please state)",
                   "properties": {
                     "yesNo": {
-                      "ta6Ref": "5.1i1"
+                      "ta6ed6v2Ref": "6.1i1"
                     }
                   }
                 },
                 "outstandingClaimsOrApplications": {
-                  "ta6Ref": "5.2",
+                  "ta6ed6v2Ref": "6.2",
                   "discriminator": {
                     "propertyName": "yesNo"
                   },
@@ -4230,10 +4275,49 @@
                           ]
                         },
                         "details": {
-                          "ta6Ref": "5.2.2"
+                          "ta6ed6v2Ref": "6.2.2",
+                          "title": "Please give details"
+                        }
+                      },
+                      "required": [
+                        "details"
+                      ]
+                    }
+                  ],
+                  "required": [
+                    "yesNo"
+                  ],
+                  "title": "Are you aware of any claims under any of these guarantees or warranties?",
+                  "properties": {
+                    "yesNo": {
+                      "ta6ed6v2Ref": "6.2.1"
+                    }
+                  }
+                },
+                "breachOfTermsOrConditions": {
+                  "ta6ed6v2Ref": "6.3",
+                  "discriminator": {
+                    "propertyName": "yesNo"
+                  },
+                  "oneOf": [
+                    {
+                      "properties": {
+                        "yesNo": {
+                          "enum": [
+                            "No"
+                          ]
+                        }
+                      }
+                    },
+                    {
+                      "properties": {
+                        "yesNo": {
+                          "enum": [
+                            "Yes"
+                          ]
                         },
-                        "attachments": {
-                          "ta6Ref": "5.2.3"
+                        "details": {
+                          "ta6ed6v2Ref": "6.3.2"
                         }
                       },
                       "required": [
@@ -4244,10 +4328,9 @@
                   "required": [
                     "yesNo"
                   ],
-                  "title": "Have any claims been made under any of these guarantees or warranties?",
                   "properties": {
                     "yesNo": {
-                      "ta6Ref": "5.2.1"
+                      "ta6ed6v2Ref": "6.3.1"
                     }
                   }
                 }
@@ -4259,42 +4342,46 @@
                 "timberRotOrInfestationTreatment",
                 "centralHeatingAndorPlumbing",
                 "doubleGlazing",
-                "electricalRepairOrInstallation",
                 "subsidenceWork",
+                "insulation",
                 "otherGuarantees",
-                "outstandingClaimsOrApplications"
+                "outstandingClaimsOrApplications",
+                "breachOfTermsOrConditions"
               ]
             }
           ],
           "required": [
             "hasValidGuaranteesOrWarranties"
           ],
+          "title": "Guarantees and warranties",
           "properties": {
             "hasValidGuaranteesOrWarranties": {
-              "ta6Ref": "5.1"
+              "ta6ed6v2Ref": "6.1",
+              "title": "Does the property have any of the following unexpired guarantees or warranties?"
             }
           }
         },
         "occupiers": {
-          "ta6Ref": "11",
+          "ta6ed6v2Ref": "13",
           "required": [
             "sellerLivesAtProperty",
             "othersAged17OrOver"
           ],
           "properties": {
             "sellerLivesAtProperty": {
-              "ta6Ref": "11.1",
+              "ta6ed6v2Ref": "13.3",
               "required": [
                 "yesNo"
               ],
+              "title": "Do you live at the property?",
               "properties": {
                 "yesNo": {
-                  "ta6Ref": "11.1.1"
+                  "ta6ed6v2Ref": "13.3.1"
                 }
               }
             },
             "othersAged17OrOver": {
-              "ta6Ref": "11.2",
+              "ta6ed6v2Ref": "13.4",
               "discriminator": {
                 "propertyName": "hasOthersAged17OrOver"
               },
@@ -4316,21 +4403,23 @@
                       ]
                     },
                     "aged17OrOverNames": {
-                      "ta6Ref": "11.3"
+                      "ta6ed6v2Ref": "13.4a",
+                      "title": "State the full names of any occupiers (other than the sellers) aged 17 or over"
                     },
                     "aged17OrOverTenantsOrLodgers": {
-                      "ta6Ref": "11.4",
+                      "ta6ed6v2Ref": "13.4b",
                       "required": [
                         "yesNo"
                       ],
+                      "title": "Are any of those occupiers who are aged 17 or over your tenants or lodgers?",
                       "properties": {
                         "yesNo": {
-                          "ta6Ref": "11.4.1"
+                          "ta6ed6v2Ref": "13.4b1"
                         }
                       }
                     },
                     "vacantPossession": {
-                      "ta6Ref": "11.5",
+                      "ta6ed6v2Ref": "13.5",
                       "discriminator": {
                         "propertyName": "soldWithVacantPossession"
                       },
@@ -4341,8 +4430,20 @@
                               "enum": [
                                 "No"
                               ]
+                            },
+                            "details": {
+                              "ta6ed6v2Ref": "13.7a",
+                              "title": "Please provide details (e.g. the property is sold let to tenants)"
+                            },
+                            "attachments": {
+                              "ta6ed6v2Ref": "13.7b",
+                              "title": "If the property is not being sold with vacant possession, provide details of all occupiers and copies of their tenancy agreements."
                             }
-                          }
+                          },
+                          "required": [
+                            "details",
+                            "attachments"
+                          ]
                         },
                         {
                           "properties": {
@@ -4352,18 +4453,18 @@
                               ]
                             },
                             "aged17OrOverAgreedToLeave": {
-                              "ta6Ref": "11.5a",
+                              "ta6ed6v2Ref": "13.6a",
                               "required": [
                                 "yesNo"
                               ],
                               "properties": {
                                 "yesNo": {
-                                  "ta6Ref": "11.5a1"
+                                  "ta6ed6v2Ref": "13.6a"
                                 }
                               }
                             },
                             "aged17OrOverWillSignToConfirmWillVacate": {
-                              "ta6Ref": "11.5b",
+                              "ta6ed6v2Ref": "13.6b",
                               "discriminator": {
                                 "propertyName": "yesNo"
                               },
@@ -4383,22 +4484,17 @@
                                       "enum": [
                                         "No"
                                       ]
-                                    },
-                                    "attachments": {
-                                      "ta6Ref": "11.5b2"
                                     }
-                                  },
-                                  "required": [
-                                    "attachments"
-                                  ]
+                                  }
                                 }
                               ],
                               "required": [
                                 "yesNo"
                               ],
+                              "title": "Have all occupiers aged 17 or over agreed to sign the sale contract and to vacate the property on or before completion?",
                               "properties": {
                                 "yesNo": {
-                                  "ta6Ref": "11.5b1"
+                                  "ta6ed6v2Ref": "13.6b1"
                                 }
                               }
                             }
@@ -4414,15 +4510,15 @@
                       ],
                       "properties": {
                         "soldWithVacantPossession": {
-                          "ta6Ref": "11.5.1"
+                          "ta6ed6v2Ref": "13.5.1",
+                          "title": "Is the property being sold with vacant possession (empty of all occupiers, rubbish and any contents or fittings not included in the sale)?"
                         }
                       }
                     }
                   },
                   "required": [
                     "aged17OrOverNames",
-                    "aged17OrOverTenantsOrLodgers",
-                    "vacantPossession"
+                    "aged17OrOverTenantsOrLodgers"
                   ]
                 }
               ],
@@ -4431,40 +4527,51 @@
               ],
               "properties": {
                 "hasOthersAged17OrOver": {
-                  "ta6Ref": "11.2.1"
+                  "ta6ed6v2Ref": "13.4",
+                  "title": "Does anyone else, aged 17 or over, live at the property?"
                 }
               }
             }
           }
         },
         "completionAndMoving": {
-          "ta6Ref": "14",
+          "ta6ed6v2Ref": "14",
           "required": [
             "sellerWillEnsure",
-            "otherPropertyInChain",
-            "moveRestrictionDates",
             "sufficientToRepayAllMortgages"
           ],
+          "title": "Completion",
           "properties": {
             "sellerWillEnsure": {
-              "ta6Ref": "14.4",
+              "ta6ed6v2Ref": "14.2",
+              "required": [
+                "removeRubbish",
+                "replaceLightFittings",
+                "takeReasonableCare",
+                "leaveKeys"
+              ],
+              "title": "Will you ensure that before or on completion",
               "properties": {
                 "removeRubbish": {
-                  "ta6Ref": "14.4a"
+                  "ta6ed6v2Ref": "14.2a",
+                  "title": "All rubbish is removed from the property (including from the loft, garden, outbuildings, garages and sheds) and that the property will be left in a clean and tidy condition?"
                 },
                 "replaceLightFittings": {
-                  "ta6Ref": "14.4b"
+                  "ta6ed6v2Ref": "14.2b",
+                  "title": "If light fittings are removed, the fittings will be replaced with ceiling rose, flex, bulb holder and bulb?"
                 },
                 "takeReasonableCare": {
-                  "ta6Ref": "14.4c"
+                  "ta6ed6v2Ref": "14.2c",
+                  "title": "Reasonable care will be taken when removing any other fittings or contents?"
                 },
                 "leaveKeys": {
-                  "ta6Ref": "14.4d"
+                  "ta6ed6v2Ref": "14.2d",
+                  "title": "Keys to all windows and doors and details of codes for alarms and any other equipment will be left at the property or with the estate agent?"
                 }
               }
             },
             "otherPropertyInChain": {
-              "ta6Ref": "14.1",
+              "ta6ed6v2Ref": "13.1",
               "discriminator": {
                 "propertyName": "yesNo"
               },
@@ -4491,15 +4598,15 @@
               "required": [
                 "yesNo"
               ],
-              "title": "Is this sale dependent on the seller completing the purchase of another property on the same day?",
+              "title": "Does this sale depend on you completing the purchase of another property on the same day?",
               "properties": {
                 "yesNo": {
-                  "ta6Ref": "14.1.1"
+                  "ta6ed6v2Ref": "13.1"
                 }
               }
             },
             "moveRestrictionDates": {
-              "ta6Ref": "14.2",
+              "ta6ed6v2Ref": "13.2",
               "discriminator": {
                 "propertyName": "yesNo"
               },
@@ -4521,7 +4628,8 @@
                       ]
                     },
                     "details": {
-                      "ta6Ref": "14.2.2"
+                      "ta6ed6v2Ref": "13.2.2",
+                      "title": "Please give details"
                     }
                   },
                   "required": [
@@ -4532,33 +4640,35 @@
               "required": [
                 "yesNo"
               ],
+              "title": "Do you have any special requirements about a moving date?",
               "properties": {
                 "yesNo": {
-                  "ta6Ref": "14.2.1"
+                  "ta6ed6v2Ref": "13.2.1"
                 }
               }
             },
             "sufficientToRepayAllMortgages": {
-              "ta6Ref": "14.3",
+              "ta6ed6v2Ref": "14.1",
               "required": [
                 "yesNo"
               ],
+              "title": "Will the sale price be sufficient to pay off on completion all mortgages and charges secured on the property?",
               "properties": {
                 "yesNo": {
-                  "ta6Ref": "14.3.1"
+                  "ta6ed6v2Ref": "14.1.1"
                 }
               }
             }
           }
         },
         "confirmationOfAccuracyByOwners": {
-          "ta6Ref": "14.5",
+          "ta6ed6v2Ref": "16",
           "required": [
             "confirmInformationIsAccurate"
           ],
           "properties": {
             "confirmInformationIsAccurate": {
-              "ta6Ref": "14.5.1"
+              "ta6ed6v2Ref": "15.3.1"
             }
           }
         }