Index: dam engine/trunk/Xsds Liquid/DamCalculationResults.xsd
===================================================================
diff -u -r459 -r585
--- dam engine/trunk/Xsds Liquid/DamCalculationResults.xsd	(.../DamCalculationResults.xsd)	(revision 459)
+++ dam engine/trunk/Xsds Liquid/DamCalculationResults.xsd	(.../DamCalculationResults.xsd)	(revision 585)
@@ -14,10 +14,10 @@
                 <xs:sequence>
                   <xs:element minOccurs="0" maxOccurs="1" name="StabilityTimeSerie" type="TimeSerie" />
                   <xs:element minOccurs="0" maxOccurs="1" name="PipingTimeSerie" type="TimeSerie" />
-                  <xs:element minOccurs="0" maxOccurs="1" name="RWScenariosResult">
+                  <xs:element minOccurs="0" maxOccurs="1" name="RegionalScenariosResult">
                     <xs:complexType>
                       <xs:sequence>
-                        <xs:element minOccurs="0" maxOccurs="unbounded" name="RWScenarioResult" type="RWScenarioResult" />
+                        <xs:element minOccurs="0" maxOccurs="unbounded" name="RegionalScenarioResult" type="RegionalScenarioResult" />
                       </xs:sequence>
                       <xs:attribute name="CalculationResult" use="required">
                         <xs:simpleType>
@@ -37,10 +37,10 @@
                       <xs:attribute name="SafetyFactor" type="xs:double" use="required" />
                     </xs:complexType>
                   </xs:element>
-                  <xs:element minOccurs="0" maxOccurs="1" name="RWSchematizationFactorsResult">
+                  <xs:element minOccurs="0" maxOccurs="1" name="RegionalSchematizationFactorsResult">
                     <xs:complexType>
                       <xs:sequence minOccurs="0" maxOccurs="unbounded">
-                        <xs:element name="RWSchematizationFactorResult">
+                        <xs:element name="RegionalSchematizationFactorResult">
                           <xs:complexType>
                             <xs:attribute name="LocationName" type="xs:string" use="required" />
                             <xs:attribute name="SchematizationType" use="required">
@@ -58,7 +58,7 @@
                             <xs:attribute name="OriginalDecisiveSoilProfileName" type="xs:string" use="required" />
                             <xs:attribute name="SchematizationFactor" type="xs:double" use="required" />
                             <xs:attribute name="SummedProfileProbability" type="xs:double" use="required" />
-                            <xs:attribute name="DecisiveScenarioName" type="xs:string" use="required" />
+                            <xs:attribute name="DecisiveRegionalScenarioName" type="xs:string" use="required" />
                             <xs:attribute name="DetrimentFactor" type="xs:double" use="required" />
                             <xs:attribute name="SafetyFactor" type="xs:double" use="required" />
                             <xs:attribute name="CalculationResult" use="required">
Index: dam engine/trunk/Xsds Liquid/DamDesignResult.xsd
===================================================================
diff -u -r472 -r585
--- dam engine/trunk/Xsds Liquid/DamDesignResult.xsd	(.../DamDesignResult.xsd)	(revision 472)
+++ dam engine/trunk/Xsds Liquid/DamDesignResult.xsd	(.../DamDesignResult.xsd)	(revision 585)
@@ -5,26 +5,6 @@
   <xs:include schemaLocation=".\DamSurfaceLine.xsd" />
   <xs:complexType name="DesignResult">
     <xs:sequence>
-      <xs:element minOccurs="0" maxOccurs="1" name="NwoDesignResults">
-        <xs:complexType>
-          <xs:attribute name="NumberOfIterations" type="xs:int" use="optional" />
-          <xs:attribute name="SafetyFactor" type="xs:double" use="optional" />
-          <xs:attribute name="Zone1SafetyFactor" type="xs:double" use="optional" />
-          <xs:attribute name="LocalZone1EntryPointX" type="xs:double" use="optional" />
-          <xs:attribute name="LocalZone1ExitPointX" type="xs:double" use="optional" />
-          <xs:attribute name="Zone2SafetyFactor" type="xs:double" use="optional" />
-          <xs:attribute name="LocalZone2EntryPointX" type="xs:double" use="optional" />
-          <xs:attribute name="LocalZone2ExitPointX" type="xs:double" use="optional" />
-          <xs:attribute name="NwoId" type="xs:string" use="required" />
-          <xs:attribute name="ResultIndex" type="xs:int" use="optional" />
-          <xs:attribute name="LocationXrdStart" type="xs:double" use="optional" />
-          <xs:attribute name="LocationYrdStart" type="xs:double" use="optional" />
-          <xs:attribute name="LocationZrdStart" type="xs:double" use="optional" />
-          <xs:attribute name="LocationXrdEnd" type="xs:double" use="optional" />
-          <xs:attribute name="LocationYrdEnd" type="xs:double" use="optional" />
-          <xs:attribute name="LocationZrdEnd" type="xs:double" use="optional" />
-        </xs:complexType>
-      </xs:element>
       <xs:element minOccurs="0" maxOccurs="1" name="StabilityDesignResults">
         <xs:complexType>
           <xs:sequence minOccurs="0" maxOccurs="1">
@@ -33,13 +13,12 @@
           </xs:sequence>
           <xs:attribute name="ResultMessage" type="xs:string" use="required" />
           <xs:attribute name="SafetyFactor" type="xs:double" use="optional" />
-          <xs:attribute name="FailureProbability" type="xs:double" use="optional" />
           <xs:attribute name="Zone1SafetyFactor" type="xs:double" use="optional" />
-          <xs:attribute name="LocalZone1EntryPointX" type="xs:double" use="optional" />
-          <xs:attribute name="LocalZone1ExitPointX" type="xs:double" use="optional" />
+          <xs:attribute name="Zone1EntryPointX" type="xs:double" use="optional" />
+          <xs:attribute name="Zone1ExitPointX" type="xs:double" use="optional" />
           <xs:attribute name="Zone2SafetyFactor" type="xs:double" use="optional" />
-          <xs:attribute name="LocalZone2EntryPointX" type="xs:double" use="optional" />
-          <xs:attribute name="LocalZone2ExitPointX" type="xs:double" use="optional" />
+          <xs:attribute name="Zone2EntryPointX" type="xs:double" use="optional" />
+          <xs:attribute name="Zone2ExitPointX" type="xs:double" use="optional" />
           <xs:attribute name="NumberOfIterations" type="xs:int" use="optional" />
         </xs:complexType>
       </xs:element>
@@ -50,7 +29,6 @@
             <xs:element name="RedesignedSurfaceLine" type="SurfaceLine" />
           </xs:sequence>
           <xs:attribute name="ResultMessage" type="xs:string" use="required" />
-          <xs:attribute name="FailureProbability" type="xs:double" use="optional" />
           <xs:attribute name="UpliftFactor" type="xs:double" use="optional" />
           <xs:attribute name="HeaveFactor" type="xs:double" use="optional" />
           <xs:attribute name="BlighFactor" type="xs:double" use="optional" />
@@ -59,21 +37,16 @@
           <xs:attribute name="Sellmeijer4ForcesHcritical" type="xs:double" use="optional" />
           <xs:attribute name="SellmeijerVnkFactor" type="xs:double" use="optional" />
           <xs:attribute name="SellmeijerVnkHcritical" type="xs:double" use="optional" />
-          <xs:attribute name="Wti2017Factor" type="xs:double" use="optional" />
-          <xs:attribute name="Wti2017Hcritical" type="xs:double" use="optional" />
-          <xs:attribute name="LocalExitPointX" type="xs:double" use="optional" />
+          <xs:attribute name="Wbi2017Factor" type="xs:double" use="optional" />
+          <xs:attribute name="Wbi2017Hcritical" type="xs:double" use="optional" />
+          <xs:attribute name="ExitPointX" type="xs:double" use="optional" />
         </xs:complexType>
       </xs:element>
     </xs:sequence>
-    <xs:attribute name="Id" type="xs:string" use="required" />
-    <xs:attribute name="Xrd" type="xs:double" use="required" />
-    <xs:attribute name="Yrd" type="xs:double" use="required" />
     <xs:attribute name="BaseFileName" type="xs:string" use="required" />
     <xs:attribute name="LocationName" type="xs:string" use="required" />
     <xs:attribute name="ScenarioName" type="xs:string" use="required" />
     <xs:attribute name="ProfileName" type="xs:string" use="required" />
-    <xs:attribute name="SafetyFactor" type="xs:double" use="optional" />
-    <xs:attribute name="FailureProbability" type="xs:double" use="optional" />
     <xs:attribute name="CalculationResult" use="required">
       <xs:simpleType>
         <xs:restriction base="xs:int">
Index: dam engine/trunk/Xsds Liquid/DamRWResult.xsd
===================================================================
diff -u -r459 -r585
--- dam engine/trunk/Xsds Liquid/DamRWResult.xsd	(.../DamRWResult.xsd)	(revision 459)
+++ dam engine/trunk/Xsds Liquid/DamRWResult.xsd	(.../DamRWResult.xsd)	(revision 585)
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- Created with Liquid XML Studio 1.0.8.0 (http://www.liquid-technologies.com) -->
 <xs:schema elementFormDefault="qualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
-  <xs:complexType name="RWResult">
-    <xs:attribute name="RWResultType" use="required">
+  <xs:complexType name="RegionalResult">
+    <xs:attribute name="RegionalResultType" use="required">
       <xs:simpleType>
         <xs:restriction base="xs:int">
           <xs:enumeration value="ProbabilityOfFailure" />
Index: dam engine/trunk/Xsds Liquid/DamUpliftSituation.xsd
===================================================================
diff -u -r451 -r585
--- dam engine/trunk/Xsds Liquid/DamUpliftSituation.xsd	(.../DamUpliftSituation.xsd)	(revision 451)
+++ dam engine/trunk/Xsds Liquid/DamUpliftSituation.xsd	(.../DamUpliftSituation.xsd)	(revision 585)
@@ -5,9 +5,9 @@
     <xs:attribute name="IsUplift" type="xs:boolean" use="required" />
     <xs:attribute name="Pl3MinUplift" type="xs:double" use="required" />
     <xs:attribute name="Pl3HeadAdjusted" type="xs:double" use="required" />
-    <xs:attribute name="Pl3LocalLocationXMinUplift" type="xs:double" use="required" />
+    <xs:attribute name="Pl3LocationXMinUplift" type="xs:double" use="required" />
     <xs:attribute name="Pl4MinUplift" type="xs:double" use="required" />
     <xs:attribute name="Pl4HeadAdjusted" type="xs:double" use="required" />
-    <xs:attribute name="Pl4LocalLocationXMinUplift" type="xs:double" use="required" />
+    <xs:attribute name="Pl4LocationXMinUplift" type="xs:double" use="required" />
   </xs:complexType>
 </xs:schema>
\ No newline at end of file
Index: dam engine/trunk/Xsds Liquid/DamRWScenarioResult.xsd
===================================================================
diff -u -r459 -r585
--- dam engine/trunk/Xsds Liquid/DamRWScenarioResult.xsd	(.../DamRWScenarioResult.xsd)	(revision 459)
+++ dam engine/trunk/Xsds Liquid/DamRWScenarioResult.xsd	(.../DamRWScenarioResult.xsd)	(revision 585)
@@ -2,15 +2,15 @@
 <!-- Created with Liquid XML Studio 1.0.8.0 (http://www.liquid-technologies.com) -->
 <xs:schema elementFormDefault="qualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
   <xs:include schemaLocation=".\DamRWResult.xsd" />
-  <xs:complexType name="RWScenarioResult">
+  <xs:complexType name="RegionalScenarioResult">
     <xs:sequence>
-      <xs:element minOccurs="0" maxOccurs="1" name="RWScenarioProfileResults">
+      <xs:element minOccurs="0" maxOccurs="1" name="RegionalScenarioProfileResults">
         <xs:complexType>
           <xs:sequence>
-            <xs:element minOccurs="0" maxOccurs="unbounded" name="RWScenarioProfileResult">
+            <xs:element minOccurs="0" maxOccurs="unbounded" name="RegionalScenarioProfileResult">
               <xs:complexType>
                 <xs:sequence>
-                  <xs:element minOccurs="0" maxOccurs="1" name="RWResult" type="RWResult" />
+                  <xs:element minOccurs="0" maxOccurs="1" name="RegionalResult" type="RegionalResult" />
                 </xs:sequence>
                 <xs:attribute name="LocationName" type="xs:string" use="required" />
                 <xs:attribute name="LoadSituation" use="required">