Index: dam engine/trunk/src/Deltares.DamEngine.Io/DamOutput.cs
===================================================================
diff -u -r504 -r591
--- dam engine/trunk/src/Deltares.DamEngine.Io/DamOutput.cs	(.../DamOutput.cs)	(revision 504)
+++ dam engine/trunk/src/Deltares.DamEngine.Io/DamOutput.cs	(.../DamOutput.cs)	(revision 591)
@@ -129,9 +129,9 @@
         
         private TimeSerie pipingTimeSerieField;
         
-        private CalculationResultsLocationResultRWScenariosResult rWScenariosResultField;
+        private CalculationResultsLocationResultRegionalScenariosResult regionalScenariosResultField;
         
-        private CalculationResultsLocationResultRWSchematizationFactorsResult rWSchematizationFactorsResultField;
+        private CalculationResultsLocationResultRegionalSchematizationFactorsResult regionalSchematizationFactorsResultField;
         
         /// <remarks/>
         public TimeSerie StabilityTimeSerie {
@@ -154,22 +154,22 @@
         }
         
         /// <remarks/>
-        public CalculationResultsLocationResultRWScenariosResult RWScenariosResult {
+        public CalculationResultsLocationResultRegionalScenariosResult RegionalScenariosResult {
             get {
-                return this.rWScenariosResultField;
+                return this.regionalScenariosResultField;
             }
             set {
-                this.rWScenariosResultField = value;
+                this.regionalScenariosResultField = value;
             }
         }
         
         /// <remarks/>
-        public CalculationResultsLocationResultRWSchematizationFactorsResult RWSchematizationFactorsResult {
+        public CalculationResultsLocationResultRegionalSchematizationFactorsResult RegionalSchematizationFactorsResult {
             get {
-                return this.rWSchematizationFactorsResultField;
+                return this.regionalSchematizationFactorsResultField;
             }
             set {
-                this.rWSchematizationFactorsResultField = value;
+                this.regionalSchematizationFactorsResultField = value;
             }
         }
     }
@@ -677,13 +677,13 @@
         
         private double pl3HeadAdjustedField;
         
-        private double pl3LocalLocationXMinUpliftField;
+        private double pl3LocationXMinUpliftField;
         
         private double pl4MinUpliftField;
         
         private double pl4HeadAdjustedField;
         
-        private double pl4LocalLocationXMinUpliftField;
+        private double pl4LocationXMinUpliftField;
         
         /// <remarks/>
         [System.Xml.Serialization.XmlAttributeAttribute()]
@@ -720,12 +720,12 @@
         
         /// <remarks/>
         [System.Xml.Serialization.XmlAttributeAttribute()]
-        public double Pl3LocalLocationXMinUplift {
+        public double Pl3LocationXMinUplift {
             get {
-                return this.pl3LocalLocationXMinUpliftField;
+                return this.pl3LocationXMinUpliftField;
             }
             set {
-                this.pl3LocalLocationXMinUpliftField = value;
+                this.pl3LocationXMinUpliftField = value;
             }
         }
         
@@ -753,12 +753,12 @@
         
         /// <remarks/>
         [System.Xml.Serialization.XmlAttributeAttribute()]
-        public double Pl4LocalLocationXMinUplift {
+        public double Pl4LocationXMinUplift {
             get {
-                return this.pl4LocalLocationXMinUpliftField;
+                return this.pl4LocationXMinUpliftField;
             }
             set {
-                this.pl4LocalLocationXMinUpliftField = value;
+                this.pl4LocationXMinUpliftField = value;
             }
         }
     }
@@ -770,18 +770,10 @@
     [System.ComponentModel.DesignerCategoryAttribute("code")]
     public partial class DesignResult {
         
-        private DesignResultNwoDesignResults nwoDesignResultsField;
-        
         private DesignResultStabilityDesignResults stabilityDesignResultsField;
         
         private DesignResultPipingDesignResults pipingDesignResultsField;
         
-        private string idField;
-        
-        private double xrdField;
-        
-        private double yrdField;
-        
         private string baseFileNameField;
         
         private string locationNameField;
@@ -790,27 +782,9 @@
         
         private string profileNameField;
         
-        private double safetyFactorField;
-        
-        private bool safetyFactorFieldSpecified;
-        
-        private double failureProbabilityField;
-        
-        private bool failureProbabilityFieldSpecified;
-        
         private int calculationResultField;
         
         /// <remarks/>
-        public DesignResultNwoDesignResults NwoDesignResults {
-            get {
-                return this.nwoDesignResultsField;
-            }
-            set {
-                this.nwoDesignResultsField = value;
-            }
-        }
-        
-        /// <remarks/>
         public DesignResultStabilityDesignResults StabilityDesignResults {
             get {
                 return this.stabilityDesignResultsField;
@@ -832,39 +806,6 @@
         
         /// <remarks/>
         [System.Xml.Serialization.XmlAttributeAttribute()]
-        public string Id {
-            get {
-                return this.idField;
-            }
-            set {
-                this.idField = value;
-            }
-        }
-        
-        /// <remarks/>
-        [System.Xml.Serialization.XmlAttributeAttribute()]
-        public double Xrd {
-            get {
-                return this.xrdField;
-            }
-            set {
-                this.xrdField = value;
-            }
-        }
-        
-        /// <remarks/>
-        [System.Xml.Serialization.XmlAttributeAttribute()]
-        public double Yrd {
-            get {
-                return this.yrdField;
-            }
-            set {
-                this.yrdField = value;
-            }
-        }
-        
-        /// <remarks/>
-        [System.Xml.Serialization.XmlAttributeAttribute()]
         public string BaseFileName {
             get {
                 return this.baseFileNameField;
@@ -909,50 +850,6 @@
         
         /// <remarks/>
         [System.Xml.Serialization.XmlAttributeAttribute()]
-        public double SafetyFactor {
-            get {
-                return this.safetyFactorField;
-            }
-            set {
-                this.safetyFactorField = value;
-            }
-        }
-        
-        /// <remarks/>
-        [System.Xml.Serialization.XmlIgnoreAttribute()]
-        public bool SafetyFactorSpecified {
-            get {
-                return this.safetyFactorFieldSpecified;
-            }
-            set {
-                this.safetyFactorFieldSpecified = value;
-            }
-        }
-        
-        /// <remarks/>
-        [System.Xml.Serialization.XmlAttributeAttribute()]
-        public double FailureProbability {
-            get {
-                return this.failureProbabilityField;
-            }
-            set {
-                this.failureProbabilityField = value;
-            }
-        }
-        
-        /// <remarks/>
-        [System.Xml.Serialization.XmlIgnoreAttribute()]
-        public bool FailureProbabilitySpecified {
-            get {
-                return this.failureProbabilityFieldSpecified;
-            }
-            set {
-                this.failureProbabilityFieldSpecified = value;
-            }
-        }
-        
-        /// <remarks/>
-        [System.Xml.Serialization.XmlAttributeAttribute()]
         public int CalculationResult {
             get {
                 return this.calculationResultField;
@@ -969,418 +866,6 @@
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
     [System.Xml.Serialization.XmlTypeAttribute(AnonymousType=true)]
-    public partial class DesignResultNwoDesignResults {
-        
-        private int numberOfIterationsField;
-        
-        private bool numberOfIterationsFieldSpecified;
-        
-        private double safetyFactorField;
-        
-        private bool safetyFactorFieldSpecified;
-        
-        private double zone1SafetyFactorField;
-        
-        private bool zone1SafetyFactorFieldSpecified;
-        
-        private double localZone1EntryPointXField;
-        
-        private bool localZone1EntryPointXFieldSpecified;
-        
-        private double localZone1ExitPointXField;
-        
-        private bool localZone1ExitPointXFieldSpecified;
-        
-        private double zone2SafetyFactorField;
-        
-        private bool zone2SafetyFactorFieldSpecified;
-        
-        private double localZone2EntryPointXField;
-        
-        private bool localZone2EntryPointXFieldSpecified;
-        
-        private double localZone2ExitPointXField;
-        
-        private bool localZone2ExitPointXFieldSpecified;
-        
-        private string nwoIdField;
-        
-        private int resultIndexField;
-        
-        private bool resultIndexFieldSpecified;
-        
-        private double locationXrdStartField;
-        
-        private bool locationXrdStartFieldSpecified;
-        
-        private double locationYrdStartField;
-        
-        private bool locationYrdStartFieldSpecified;
-        
-        private double locationZrdStartField;
-        
-        private bool locationZrdStartFieldSpecified;
-        
-        private double locationXrdEndField;
-        
-        private bool locationXrdEndFieldSpecified;
-        
-        private double locationYrdEndField;
-        
-        private bool locationYrdEndFieldSpecified;
-        
-        private double locationZrdEndField;
-        
-        private bool locationZrdEndFieldSpecified;
-        
-        /// <remarks/>
-        [System.Xml.Serialization.XmlAttributeAttribute()]
-        public int NumberOfIterations {
-            get {
-                return this.numberOfIterationsField;
-            }
-            set {
-                this.numberOfIterationsField = value;
-            }
-        }
-        
-        /// <remarks/>
-        [System.Xml.Serialization.XmlIgnoreAttribute()]
-        public bool NumberOfIterationsSpecified {
-            get {
-                return this.numberOfIterationsFieldSpecified;
-            }
-            set {
-                this.numberOfIterationsFieldSpecified = value;
-            }
-        }
-        
-        /// <remarks/>
-        [System.Xml.Serialization.XmlAttributeAttribute()]
-        public double SafetyFactor {
-            get {
-                return this.safetyFactorField;
-            }
-            set {
-                this.safetyFactorField = value;
-            }
-        }
-        
-        /// <remarks/>
-        [System.Xml.Serialization.XmlIgnoreAttribute()]
-        public bool SafetyFactorSpecified {
-            get {
-                return this.safetyFactorFieldSpecified;
-            }
-            set {
-                this.safetyFactorFieldSpecified = value;
-            }
-        }
-        
-        /// <remarks/>
-        [System.Xml.Serialization.XmlAttributeAttribute()]
-        public double Zone1SafetyFactor {
-            get {
-                return this.zone1SafetyFactorField;
-            }
-            set {
-                this.zone1SafetyFactorField = value;
-            }
-        }
-        
-        /// <remarks/>
-        [System.Xml.Serialization.XmlIgnoreAttribute()]
-        public bool Zone1SafetyFactorSpecified {
-            get {
-                return this.zone1SafetyFactorFieldSpecified;
-            }
-            set {
-                this.zone1SafetyFactorFieldSpecified = value;
-            }
-        }
-        
-        /// <remarks/>
-        [System.Xml.Serialization.XmlAttributeAttribute()]
-        public double LocalZone1EntryPointX {
-            get {
-                return this.localZone1EntryPointXField;
-            }
-            set {
-                this.localZone1EntryPointXField = value;
-            }
-        }
-        
-        /// <remarks/>
-        [System.Xml.Serialization.XmlIgnoreAttribute()]
-        public bool LocalZone1EntryPointXSpecified {
-            get {
-                return this.localZone1EntryPointXFieldSpecified;
-            }
-            set {
-                this.localZone1EntryPointXFieldSpecified = value;
-            }
-        }
-        
-        /// <remarks/>
-        [System.Xml.Serialization.XmlAttributeAttribute()]
-        public double LocalZone1ExitPointX {
-            get {
-                return this.localZone1ExitPointXField;
-            }
-            set {
-                this.localZone1ExitPointXField = value;
-            }
-        }
-        
-        /// <remarks/>
-        [System.Xml.Serialization.XmlIgnoreAttribute()]
-        public bool LocalZone1ExitPointXSpecified {
-            get {
-                return this.localZone1ExitPointXFieldSpecified;
-            }
-            set {
-                this.localZone1ExitPointXFieldSpecified = value;
-            }
-        }
-        
-        /// <remarks/>
-        [System.Xml.Serialization.XmlAttributeAttribute()]
-        public double Zone2SafetyFactor {
-            get {
-                return this.zone2SafetyFactorField;
-            }
-            set {
-                this.zone2SafetyFactorField = value;
-            }
-        }
-        
-        /// <remarks/>
-        [System.Xml.Serialization.XmlIgnoreAttribute()]
-        public bool Zone2SafetyFactorSpecified {
-            get {
-                return this.zone2SafetyFactorFieldSpecified;
-            }
-            set {
-                this.zone2SafetyFactorFieldSpecified = value;
-            }
-        }
-        
-        /// <remarks/>
-        [System.Xml.Serialization.XmlAttributeAttribute()]
-        public double LocalZone2EntryPointX {
-            get {
-                return this.localZone2EntryPointXField;
-            }
-            set {
-                this.localZone2EntryPointXField = value;
-            }
-        }
-        
-        /// <remarks/>
-        [System.Xml.Serialization.XmlIgnoreAttribute()]
-        public bool LocalZone2EntryPointXSpecified {
-            get {
-                return this.localZone2EntryPointXFieldSpecified;
-            }
-            set {
-                this.localZone2EntryPointXFieldSpecified = value;
-            }
-        }
-        
-        /// <remarks/>
-        [System.Xml.Serialization.XmlAttributeAttribute()]
-        public double LocalZone2ExitPointX {
-            get {
-                return this.localZone2ExitPointXField;
-            }
-            set {
-                this.localZone2ExitPointXField = value;
-            }
-        }
-        
-        /// <remarks/>
-        [System.Xml.Serialization.XmlIgnoreAttribute()]
-        public bool LocalZone2ExitPointXSpecified {
-            get {
-                return this.localZone2ExitPointXFieldSpecified;
-            }
-            set {
-                this.localZone2ExitPointXFieldSpecified = value;
-            }
-        }
-        
-        /// <remarks/>
-        [System.Xml.Serialization.XmlAttributeAttribute()]
-        public string NwoId {
-            get {
-                return this.nwoIdField;
-            }
-            set {
-                this.nwoIdField = value;
-            }
-        }
-        
-        /// <remarks/>
-        [System.Xml.Serialization.XmlAttributeAttribute()]
-        public int ResultIndex {
-            get {
-                return this.resultIndexField;
-            }
-            set {
-                this.resultIndexField = value;
-            }
-        }
-        
-        /// <remarks/>
-        [System.Xml.Serialization.XmlIgnoreAttribute()]
-        public bool ResultIndexSpecified {
-            get {
-                return this.resultIndexFieldSpecified;
-            }
-            set {
-                this.resultIndexFieldSpecified = value;
-            }
-        }
-        
-        /// <remarks/>
-        [System.Xml.Serialization.XmlAttributeAttribute()]
-        public double LocationXrdStart {
-            get {
-                return this.locationXrdStartField;
-            }
-            set {
-                this.locationXrdStartField = value;
-            }
-        }
-        
-        /// <remarks/>
-        [System.Xml.Serialization.XmlIgnoreAttribute()]
-        public bool LocationXrdStartSpecified {
-            get {
-                return this.locationXrdStartFieldSpecified;
-            }
-            set {
-                this.locationXrdStartFieldSpecified = value;
-            }
-        }
-        
-        /// <remarks/>
-        [System.Xml.Serialization.XmlAttributeAttribute()]
-        public double LocationYrdStart {
-            get {
-                return this.locationYrdStartField;
-            }
-            set {
-                this.locationYrdStartField = value;
-            }
-        }
-        
-        /// <remarks/>
-        [System.Xml.Serialization.XmlIgnoreAttribute()]
-        public bool LocationYrdStartSpecified {
-            get {
-                return this.locationYrdStartFieldSpecified;
-            }
-            set {
-                this.locationYrdStartFieldSpecified = value;
-            }
-        }
-        
-        /// <remarks/>
-        [System.Xml.Serialization.XmlAttributeAttribute()]
-        public double LocationZrdStart {
-            get {
-                return this.locationZrdStartField;
-            }
-            set {
-                this.locationZrdStartField = value;
-            }
-        }
-        
-        /// <remarks/>
-        [System.Xml.Serialization.XmlIgnoreAttribute()]
-        public bool LocationZrdStartSpecified {
-            get {
-                return this.locationZrdStartFieldSpecified;
-            }
-            set {
-                this.locationZrdStartFieldSpecified = value;
-            }
-        }
-        
-        /// <remarks/>
-        [System.Xml.Serialization.XmlAttributeAttribute()]
-        public double LocationXrdEnd {
-            get {
-                return this.locationXrdEndField;
-            }
-            set {
-                this.locationXrdEndField = value;
-            }
-        }
-        
-        /// <remarks/>
-        [System.Xml.Serialization.XmlIgnoreAttribute()]
-        public bool LocationXrdEndSpecified {
-            get {
-                return this.locationXrdEndFieldSpecified;
-            }
-            set {
-                this.locationXrdEndFieldSpecified = value;
-            }
-        }
-        
-        /// <remarks/>
-        [System.Xml.Serialization.XmlAttributeAttribute()]
-        public double LocationYrdEnd {
-            get {
-                return this.locationYrdEndField;
-            }
-            set {
-                this.locationYrdEndField = value;
-            }
-        }
-        
-        /// <remarks/>
-        [System.Xml.Serialization.XmlIgnoreAttribute()]
-        public bool LocationYrdEndSpecified {
-            get {
-                return this.locationYrdEndFieldSpecified;
-            }
-            set {
-                this.locationYrdEndFieldSpecified = value;
-            }
-        }
-        
-        /// <remarks/>
-        [System.Xml.Serialization.XmlAttributeAttribute()]
-        public double LocationZrdEnd {
-            get {
-                return this.locationZrdEndField;
-            }
-            set {
-                this.locationZrdEndField = value;
-            }
-        }
-        
-        /// <remarks/>
-        [System.Xml.Serialization.XmlIgnoreAttribute()]
-        public bool LocationZrdEndSpecified {
-            get {
-                return this.locationZrdEndFieldSpecified;
-            }
-            set {
-                this.locationZrdEndFieldSpecified = value;
-            }
-        }
-    }
-    
-    /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.6.1055.0")]
-    [System.SerializableAttribute()]
-    [System.Diagnostics.DebuggerStepThroughAttribute()]
-    [System.ComponentModel.DesignerCategoryAttribute("code")]
-    [System.Xml.Serialization.XmlTypeAttribute(AnonymousType=true)]
     public partial class DesignResultStabilityDesignResults {
         
         private UpliftSituation upliftSituationField;
@@ -1393,33 +878,29 @@
         
         private bool safetyFactorFieldSpecified;
         
-        private double failureProbabilityField;
-        
-        private bool failureProbabilityFieldSpecified;
-        
         private double zone1SafetyFactorField;
         
         private bool zone1SafetyFactorFieldSpecified;
         
-        private double localZone1EntryPointXField;
+        private double zone1EntryPointXField;
         
-        private bool localZone1EntryPointXFieldSpecified;
+        private bool zone1EntryPointXFieldSpecified;
         
-        private double localZone1ExitPointXField;
+        private double zone1ExitPointXField;
         
-        private bool localZone1ExitPointXFieldSpecified;
+        private bool zone1ExitPointXFieldSpecified;
         
         private double zone2SafetyFactorField;
         
         private bool zone2SafetyFactorFieldSpecified;
         
-        private double localZone2EntryPointXField;
+        private double zone2EntryPointXField;
         
-        private bool localZone2EntryPointXFieldSpecified;
+        private bool zone2EntryPointXFieldSpecified;
         
-        private double localZone2ExitPointXField;
+        private double zone2ExitPointXField;
         
-        private bool localZone2ExitPointXFieldSpecified;
+        private bool zone2ExitPointXFieldSpecified;
         
         private int numberOfIterationsField;
         
@@ -1480,28 +961,6 @@
         
         /// <remarks/>
         [System.Xml.Serialization.XmlAttributeAttribute()]
-        public double FailureProbability {
-            get {
-                return this.failureProbabilityField;
-            }
-            set {
-                this.failureProbabilityField = value;
-            }
-        }
-        
-        /// <remarks/>
-        [System.Xml.Serialization.XmlIgnoreAttribute()]
-        public bool FailureProbabilitySpecified {
-            get {
-                return this.failureProbabilityFieldSpecified;
-            }
-            set {
-                this.failureProbabilityFieldSpecified = value;
-            }
-        }
-        
-        /// <remarks/>
-        [System.Xml.Serialization.XmlAttributeAttribute()]
         public double Zone1SafetyFactor {
             get {
                 return this.zone1SafetyFactorField;
@@ -1524,45 +983,45 @@
         
         /// <remarks/>
         [System.Xml.Serialization.XmlAttributeAttribute()]
-        public double LocalZone1EntryPointX {
+        public double Zone1EntryPointX {
             get {
-                return this.localZone1EntryPointXField;
+                return this.zone1EntryPointXField;
             }
             set {
-                this.localZone1EntryPointXField = value;
+                this.zone1EntryPointXField = value;
             }
         }
         
         /// <remarks/>
         [System.Xml.Serialization.XmlIgnoreAttribute()]
-        public bool LocalZone1EntryPointXSpecified {
+        public bool Zone1EntryPointXSpecified {
             get {
-                return this.localZone1EntryPointXFieldSpecified;
+                return this.zone1EntryPointXFieldSpecified;
             }
             set {
-                this.localZone1EntryPointXFieldSpecified = value;
+                this.zone1EntryPointXFieldSpecified = value;
             }
         }
         
         /// <remarks/>
         [System.Xml.Serialization.XmlAttributeAttribute()]
-        public double LocalZone1ExitPointX {
+        public double Zone1ExitPointX {
             get {
-                return this.localZone1ExitPointXField;
+                return this.zone1ExitPointXField;
             }
             set {
-                this.localZone1ExitPointXField = value;
+                this.zone1ExitPointXField = value;
             }
         }
         
         /// <remarks/>
         [System.Xml.Serialization.XmlIgnoreAttribute()]
-        public bool LocalZone1ExitPointXSpecified {
+        public bool Zone1ExitPointXSpecified {
             get {
-                return this.localZone1ExitPointXFieldSpecified;
+                return this.zone1ExitPointXFieldSpecified;
             }
             set {
-                this.localZone1ExitPointXFieldSpecified = value;
+                this.zone1ExitPointXFieldSpecified = value;
             }
         }
         
@@ -1590,45 +1049,45 @@
         
         /// <remarks/>
         [System.Xml.Serialization.XmlAttributeAttribute()]
-        public double LocalZone2EntryPointX {
+        public double Zone2EntryPointX {
             get {
-                return this.localZone2EntryPointXField;
+                return this.zone2EntryPointXField;
             }
             set {
-                this.localZone2EntryPointXField = value;
+                this.zone2EntryPointXField = value;
             }
         }
         
         /// <remarks/>
         [System.Xml.Serialization.XmlIgnoreAttribute()]
-        public bool LocalZone2EntryPointXSpecified {
+        public bool Zone2EntryPointXSpecified {
             get {
-                return this.localZone2EntryPointXFieldSpecified;
+                return this.zone2EntryPointXFieldSpecified;
             }
             set {
-                this.localZone2EntryPointXFieldSpecified = value;
+                this.zone2EntryPointXFieldSpecified = value;
             }
         }
         
         /// <remarks/>
         [System.Xml.Serialization.XmlAttributeAttribute()]
-        public double LocalZone2ExitPointX {
+        public double Zone2ExitPointX {
             get {
-                return this.localZone2ExitPointXField;
+                return this.zone2ExitPointXField;
             }
             set {
-                this.localZone2ExitPointXField = value;
+                this.zone2ExitPointXField = value;
             }
         }
         
         /// <remarks/>
         [System.Xml.Serialization.XmlIgnoreAttribute()]
-        public bool LocalZone2ExitPointXSpecified {
+        public bool Zone2ExitPointXSpecified {
             get {
-                return this.localZone2ExitPointXFieldSpecified;
+                return this.zone2ExitPointXFieldSpecified;
             }
             set {
-                this.localZone2ExitPointXFieldSpecified = value;
+                this.zone2ExitPointXFieldSpecified = value;
             }
         }
         
@@ -1669,10 +1128,6 @@
         
         private string resultMessageField;
         
-        private double failureProbabilityField;
-        
-        private bool failureProbabilityFieldSpecified;
-        
         private double upliftFactorField;
         
         private bool upliftFactorFieldSpecified;
@@ -1705,17 +1160,17 @@
         
         private bool sellmeijerVnkHcriticalFieldSpecified;
         
-        private double wti2017FactorField;
+        private double wbi2017FactorField;
         
-        private bool wti2017FactorFieldSpecified;
+        private bool wbi2017FactorFieldSpecified;
         
-        private double wti2017HcriticalField;
+        private double wbi2017HcriticalField;
         
-        private bool wti2017HcriticalFieldSpecified;
+        private bool wbi2017HcriticalFieldSpecified;
         
-        private double localExitPointXField;
+        private double exitPointXField;
         
-        private bool localExitPointXFieldSpecified;
+        private bool exitPointXFieldSpecified;
         
         /// <remarks/>
         public UpliftSituation UpliftSituation {
@@ -1750,28 +1205,6 @@
         
         /// <remarks/>
         [System.Xml.Serialization.XmlAttributeAttribute()]
-        public double FailureProbability {
-            get {
-                return this.failureProbabilityField;
-            }
-            set {
-                this.failureProbabilityField = value;
-            }
-        }
-        
-        /// <remarks/>
-        [System.Xml.Serialization.XmlIgnoreAttribute()]
-        public bool FailureProbabilitySpecified {
-            get {
-                return this.failureProbabilityFieldSpecified;
-            }
-            set {
-                this.failureProbabilityFieldSpecified = value;
-            }
-        }
-        
-        /// <remarks/>
-        [System.Xml.Serialization.XmlAttributeAttribute()]
         public double UpliftFactor {
             get {
                 return this.upliftFactorField;
@@ -1948,67 +1381,67 @@
         
         /// <remarks/>
         [System.Xml.Serialization.XmlAttributeAttribute()]
-        public double Wti2017Factor {
+        public double Wbi2017Factor {
             get {
-                return this.wti2017FactorField;
+                return this.wbi2017FactorField;
             }
             set {
-                this.wti2017FactorField = value;
+                this.wbi2017FactorField = value;
             }
         }
         
         /// <remarks/>
         [System.Xml.Serialization.XmlIgnoreAttribute()]
-        public bool Wti2017FactorSpecified {
+        public bool Wbi2017FactorSpecified {
             get {
-                return this.wti2017FactorFieldSpecified;
+                return this.wbi2017FactorFieldSpecified;
             }
             set {
-                this.wti2017FactorFieldSpecified = value;
+                this.wbi2017FactorFieldSpecified = value;
             }
         }
         
         /// <remarks/>
         [System.Xml.Serialization.XmlAttributeAttribute()]
-        public double Wti2017Hcritical {
+        public double Wbi2017Hcritical {
             get {
-                return this.wti2017HcriticalField;
+                return this.wbi2017HcriticalField;
             }
             set {
-                this.wti2017HcriticalField = value;
+                this.wbi2017HcriticalField = value;
             }
         }
         
         /// <remarks/>
         [System.Xml.Serialization.XmlIgnoreAttribute()]
-        public bool Wti2017HcriticalSpecified {
+        public bool Wbi2017HcriticalSpecified {
             get {
-                return this.wti2017HcriticalFieldSpecified;
+                return this.wbi2017HcriticalFieldSpecified;
             }
             set {
-                this.wti2017HcriticalFieldSpecified = value;
+                this.wbi2017HcriticalFieldSpecified = value;
             }
         }
         
         /// <remarks/>
         [System.Xml.Serialization.XmlAttributeAttribute()]
-        public double LocalExitPointX {
+        public double ExitPointX {
             get {
-                return this.localExitPointXField;
+                return this.exitPointXField;
             }
             set {
-                this.localExitPointXField = value;
+                this.exitPointXField = value;
             }
         }
         
         /// <remarks/>
         [System.Xml.Serialization.XmlIgnoreAttribute()]
-        public bool LocalExitPointXSpecified {
+        public bool ExitPointXSpecified {
             get {
-                return this.localExitPointXFieldSpecified;
+                return this.exitPointXFieldSpecified;
             }
             set {
-                this.localExitPointXFieldSpecified = value;
+                this.exitPointXFieldSpecified = value;
             }
         }
     }
@@ -2018,9 +1451,9 @@
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
-    public partial class RWResult {
+    public partial class RegionalResult {
         
-        private int rWResultTypeField;
+        private int regionalResultTypeField;
         
         private double safetyFactorField;
         
@@ -2030,12 +1463,12 @@
         
         /// <remarks/>
         [System.Xml.Serialization.XmlAttributeAttribute()]
-        public int RWResultType {
+        public int RegionalResultType {
             get {
-                return this.rWResultTypeField;
+                return this.regionalResultTypeField;
             }
             set {
-                this.rWResultTypeField = value;
+                this.regionalResultTypeField = value;
             }
         }
         
@@ -2078,9 +1511,9 @@
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
-    public partial class RWScenarioResult {
+    public partial class RegionalScenarioResult {
         
-        private RWScenarioResultRWScenarioProfileResult[] rWScenarioProfileResultsField;
+        private RegionalScenarioResultRegionalScenarioProfileResult[] regionalScenarioProfileResultsField;
         
         private int loadSituationField;
         
@@ -2099,13 +1532,13 @@
         private double safetyFactorField;
         
         /// <remarks/>
-        [System.Xml.Serialization.XmlArrayItemAttribute("RWScenarioProfileResult", IsNullable=false)]
-        public RWScenarioResultRWScenarioProfileResult[] RWScenarioProfileResults {
+        [System.Xml.Serialization.XmlArrayItemAttribute("RegionalScenarioProfileResult", IsNullable=false)]
+        public RegionalScenarioResultRegionalScenarioProfileResult[] RegionalScenarioProfileResults {
             get {
-                return this.rWScenarioProfileResultsField;
+                return this.regionalScenarioProfileResultsField;
             }
             set {
-                this.rWScenarioProfileResultsField = value;
+                this.regionalScenarioProfileResultsField = value;
             }
         }
         
@@ -2204,9 +1637,9 @@
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
     [System.Xml.Serialization.XmlTypeAttribute(AnonymousType=true)]
-    public partial class RWScenarioResultRWScenarioProfileResult {
+    public partial class RegionalScenarioResultRegionalScenarioProfileResult {
         
-        private RWResult rWResultField;
+        private RegionalResult regionalResultField;
         
         private string locationNameField;
         
@@ -2233,12 +1666,12 @@
         private string baseFileNameField;
         
         /// <remarks/>
-        public RWResult RWResult {
+        public RegionalResult RegionalResult {
             get {
-                return this.rWResultField;
+                return this.regionalResultField;
             }
             set {
-                this.rWResultField = value;
+                this.regionalResultField = value;
             }
         }
         
@@ -2537,22 +1970,22 @@
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
     [System.Xml.Serialization.XmlTypeAttribute(AnonymousType=true)]
-    public partial class CalculationResultsLocationResultRWScenariosResult {
+    public partial class CalculationResultsLocationResultRegionalScenariosResult {
         
-        private RWScenarioResult[] rWScenarioResultField;
+        private RegionalScenarioResult[] regionalScenarioResultField;
         
         private int calculationResultField;
         
         private double safetyFactorField;
         
         /// <remarks/>
-        [System.Xml.Serialization.XmlElementAttribute("RWScenarioResult")]
-        public RWScenarioResult[] RWScenarioResult {
+        [System.Xml.Serialization.XmlElementAttribute("RegionalScenarioResult")]
+        public RegionalScenarioResult[] RegionalScenarioResult {
             get {
-                return this.rWScenarioResultField;
+                return this.regionalScenarioResultField;
             }
             set {
-                this.rWScenarioResultField = value;
+                this.regionalScenarioResultField = value;
             }
         }
         
@@ -2585,18 +2018,18 @@
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
     [System.Xml.Serialization.XmlTypeAttribute(AnonymousType=true)]
-    public partial class CalculationResultsLocationResultRWSchematizationFactorsResult {
+    public partial class CalculationResultsLocationResultRegionalSchematizationFactorsResult {
         
-        private CalculationResultsLocationResultRWSchematizationFactorsResultRWSchematizationFactorResult[] rWSchematizationFactorResultField;
+        private CalculationResultsLocationResultRegionalSchematizationFactorsResultRegionalSchematizationFactorResult[] regionalSchematizationFactorResultField;
         
         /// <remarks/>
-        [System.Xml.Serialization.XmlElementAttribute("RWSchematizationFactorResult")]
-        public CalculationResultsLocationResultRWSchematizationFactorsResultRWSchematizationFactorResult[] RWSchematizationFactorResult {
+        [System.Xml.Serialization.XmlElementAttribute("RegionalSchematizationFactorResult")]
+        public CalculationResultsLocationResultRegionalSchematizationFactorsResultRegionalSchematizationFactorResult[] RegionalSchematizationFactorResult {
             get {
-                return this.rWSchematizationFactorResultField;
+                return this.regionalSchematizationFactorResultField;
             }
             set {
-                this.rWSchematizationFactorResultField = value;
+                this.regionalSchematizationFactorResultField = value;
             }
         }
     }
@@ -2607,11 +2040,11 @@
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
     [System.Xml.Serialization.XmlTypeAttribute(AnonymousType=true)]
-    public partial class CalculationResultsLocationResultRWSchematizationFactorsResultRWSchematizationFactorResult {
+    public partial class CalculationResultsLocationResultRegionalSchematizationFactorsResultRegionalSchematizationFactorResult {
         
         private string locationNameField;
         
-        private CalculationResultsLocationResultRWSchematizationFactorsResultRWSchematizationFactorResultSchematizationType schematizationTypeField;
+        private CalculationResultsLocationResultRegionalSchematizationFactorsResultRegionalSchematizationFactorResultSchematizationType schematizationTypeField;
         
         private string soilProfileNameField;
         
@@ -2621,13 +2054,13 @@
         
         private double summedProfileProbabilityField;
         
-        private string decisiveScenarioNameField;
+        private string decisiveRegionalScenarioNameField;
         
         private double detrimentFactorField;
         
         private double safetyFactorField;
         
-        private CalculationResultsLocationResultRWSchematizationFactorsResultRWSchematizationFactorResultCalculationResult calculationResultField;
+        private CalculationResultsLocationResultRegionalSchematizationFactorsResultRegionalSchematizationFactorResultCalculationResult calculationResultField;
         
         /// <remarks/>
         [System.Xml.Serialization.XmlAttributeAttribute()]
@@ -2642,7 +2075,7 @@
         
         /// <remarks/>
         [System.Xml.Serialization.XmlAttributeAttribute()]
-        public CalculationResultsLocationResultRWSchematizationFactorsResultRWSchematizationFactorResultSchematizationType SchematizationType {
+        public CalculationResultsLocationResultRegionalSchematizationFactorsResultRegionalSchematizationFactorResultSchematizationType SchematizationType {
             get {
                 return this.schematizationTypeField;
             }
@@ -2697,12 +2130,12 @@
         
         /// <remarks/>
         [System.Xml.Serialization.XmlAttributeAttribute()]
-        public string DecisiveScenarioName {
+        public string DecisiveRegionalScenarioName {
             get {
-                return this.decisiveScenarioNameField;
+                return this.decisiveRegionalScenarioNameField;
             }
             set {
-                this.decisiveScenarioNameField = value;
+                this.decisiveRegionalScenarioNameField = value;
             }
         }
         
@@ -2730,7 +2163,7 @@
         
         /// <remarks/>
         [System.Xml.Serialization.XmlAttributeAttribute()]
-        public CalculationResultsLocationResultRWSchematizationFactorsResultRWSchematizationFactorResultCalculationResult CalculationResult {
+        public CalculationResultsLocationResultRegionalSchematizationFactorsResultRegionalSchematizationFactorResultCalculationResult CalculationResult {
             get {
                 return this.calculationResultField;
             }
@@ -2744,7 +2177,7 @@
     [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.6.1055.0")]
     [System.SerializableAttribute()]
     [System.Xml.Serialization.XmlTypeAttribute(AnonymousType=true)]
-    public enum CalculationResultsLocationResultRWSchematizationFactorsResultRWSchematizationFactorResultSchematizationType {
+    public enum CalculationResultsLocationResultRegionalSchematizationFactorsResultRegionalSchematizationFactorResultSchematizationType {
         
         /// <remarks/>
         MacroStabilityInnerSideWet,
@@ -2766,7 +2199,7 @@
     [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.6.1055.0")]
     [System.SerializableAttribute()]
     [System.Xml.Serialization.XmlTypeAttribute(AnonymousType=true)]
-    public enum CalculationResultsLocationResultRWSchematizationFactorsResultRWSchematizationFactorResultCalculationResult {
+    public enum CalculationResultsLocationResultRegionalSchematizationFactorsResultRegionalSchematizationFactorResultCalculationResult {
         
         /// <remarks/>
         NoRun,