Index: DamEngine/trunk/xsd/GenerateClasses.bat
===================================================================
diff -u -r972 -r2032
--- DamEngine/trunk/xsd/GenerateClasses.bat	(.../GenerateClasses.bat)	(revision 972)
+++ DamEngine/trunk/xsd/GenerateClasses.bat	(.../GenerateClasses.bat)	(revision 2032)
@@ -1,3 +1,4 @@
+REM Start the Developer Command Prompt (for VS2015) and go to this directory. Then start this batchfile.
 xsd /c /l:cs /n:Deltares.DamEngine.Io.XmlInput DamInput.xsd
 copy DamInput.cs ..\src\Deltares.DamEngine.Io\DamInput.cs
 
Index: DamEngine/trunk/src/Deltares.DamEngine.Data/General/DamFailureMechanismeCalculationSpecification.cs
===================================================================
diff -u -r1977 -r2032
--- DamEngine/trunk/src/Deltares.DamEngine.Data/General/DamFailureMechanismeCalculationSpecification.cs	(.../DamFailureMechanismeCalculationSpecification.cs)	(revision 1977)
+++ DamEngine/trunk/src/Deltares.DamEngine.Data/General/DamFailureMechanismeCalculationSpecification.cs	(.../DamFailureMechanismeCalculationSpecification.cs)	(revision 2032)
@@ -81,7 +81,6 @@
                     var oldPipingModelType = pipingModelType;
                     switch (failureMechanismSystemType)
                     {
-                        case FailureMechanismSystemType.WtiStabilityInside:
                         case FailureMechanismSystemType.StabilityInside:
                             failureMechanismParametersMStab.MStabParameters.GridPosition = MStabGridPosition.Right;
                             break;
@@ -222,7 +221,6 @@
             string description = "";
             description += String.Format("{0}", this.FailureMechanismSystemType);
             if ((this.FailureMechanismSystemType == FailureMechanismSystemType.StabilityInside) ||
-              (this.FailureMechanismSystemType == FailureMechanismSystemType.WtiStabilityInside) ||
               (this.FailureMechanismSystemType == FailureMechanismSystemType.StabilityOutside))
             {
                 //interface?
Index: DamEngine/trunk/src/Deltares.DamEngine.Io/DamInput.cs
===================================================================
diff -u -r1977 -r2032
--- DamEngine/trunk/src/Deltares.DamEngine.Io/DamInput.cs	(.../DamInput.cs)	(revision 1977)
+++ DamEngine/trunk/src/Deltares.DamEngine.Io/DamInput.cs	(.../DamInput.cs)	(revision 2032)
@@ -4883,6 +4883,9 @@
         
         /// <remarks/>
         BishopUpliftVan,
+        
+        /// <remarks/>
+        UpliftVanWti,
     }
     
     /// <remarks/>
Index: DamEngine/trunk/src/Deltares.DamEngine.Data/General/Results/DesignResult.cs
===================================================================
diff -u -r1977 -r2032
--- DamEngine/trunk/src/Deltares.DamEngine.Data/General/Results/DesignResult.cs	(.../DesignResult.cs)	(revision 1977)
+++ DamEngine/trunk/src/Deltares.DamEngine.Data/General/Results/DesignResult.cs	(.../DesignResult.cs)	(revision 2032)
@@ -61,7 +61,6 @@
                 {
                     switch (DamFailureMechanismeCalculation.FailureMechanismSystemType)
                     {
-                        case FailureMechanismSystemType.WtiStabilityInside:
                         case FailureMechanismSystemType.StabilityInside:
                         case FailureMechanismSystemType.StabilityOutside:
                         case FailureMechanismSystemType.HorizontalBalance:
@@ -151,7 +150,6 @@
             {
                 switch (damFailureMechanismeCalculationSpecification.FailureMechanismSystemType)
                 {
-                    case FailureMechanismSystemType.WtiStabilityInside:   // #Bka: For now use soilGeometry2DName, probably this must become soilProfile2D.Name and soilProfile2D should be passed. Or soilProfile2D will be used for filling soilGeometry2DName before calling this
                     case FailureMechanismSystemType.StabilityInside:
                     case FailureMechanismSystemType.HorizontalBalance:
                     case FailureMechanismSystemType.StabilityOutside:
Index: DamEngine/trunk/src/Deltares.DamEngine.Interface/ConversionHelper.cs
===================================================================
diff -u -r1977 -r2032
--- DamEngine/trunk/src/Deltares.DamEngine.Interface/ConversionHelper.cs	(.../ConversionHelper.cs)	(revision 1977)
+++ DamEngine/trunk/src/Deltares.DamEngine.Interface/ConversionHelper.cs	(.../ConversionHelper.cs)	(revision 2032)
@@ -337,8 +337,7 @@
         public const int InputFailureMechanismStabilityOutside = 1;
         public const int InputFailureMechanismPiping = 2;
         public const int InputFailureMechanismHorizontalBalance = 3;
-        public const int InputFailureMechanismWtiStabilityInside = 4;
-
+        
         /// <summary>
         /// Converts the Dam failure mechanism type to the input failure mechanism type .
         /// </summary>
@@ -351,8 +350,7 @@
                 {FailureMechanismSystemType.StabilityInside, InputFailureMechanismStabilityInside},
                 {FailureMechanismSystemType.StabilityOutside, InputFailureMechanismStabilityOutside},
                 {FailureMechanismSystemType.Piping, InputFailureMechanismPiping},
-                {FailureMechanismSystemType.HorizontalBalance, InputFailureMechanismHorizontalBalance},
-                {FailureMechanismSystemType.WtiStabilityInside, InputFailureMechanismWtiStabilityInside}
+                {FailureMechanismSystemType.HorizontalBalance, InputFailureMechanismHorizontalBalance}
             };
             return translationTable[segmentFailureMechanismType];
         }
@@ -369,8 +367,7 @@
                 {InputFailureMechanismStabilityInside, FailureMechanismSystemType.StabilityInside},
                 {InputFailureMechanismStabilityOutside, FailureMechanismSystemType.StabilityOutside},
                 {InputFailureMechanismPiping, FailureMechanismSystemType.Piping},
-                {InputFailureMechanismHorizontalBalance, FailureMechanismSystemType.HorizontalBalance},
-                {InputFailureMechanismWtiStabilityInside, FailureMechanismSystemType.WtiStabilityInside}
+                {InputFailureMechanismHorizontalBalance, FailureMechanismSystemType.HorizontalBalance}
             };
             return translationTable[failureMechanismSystemType];
         }
@@ -420,7 +417,8 @@
             {
                 {MStabModelType.Bishop, InputStabilityModelType.Bishop},
                 {MStabModelType.UpliftVan, InputStabilityModelType.UpliftVan},
-                {MStabModelType.BishopUpliftVan, InputStabilityModelType.BishopUpliftVan}
+                {MStabModelType.BishopUpliftVan, InputStabilityModelType.BishopUpliftVan},
+                {MStabModelType.UpliftVanWti, InputStabilityModelType.UpliftVanWti},
             };
             return translationTable[stabilityModelType];
         }
@@ -436,7 +434,8 @@
             {
                 {InputStabilityModelType.Bishop, MStabModelType.Bishop},
                 {InputStabilityModelType.UpliftVan, MStabModelType.UpliftVan},
-                {InputStabilityModelType.BishopUpliftVan, MStabModelType.BishopUpliftVan}
+                {InputStabilityModelType.BishopUpliftVan, MStabModelType.BishopUpliftVan},
+                {InputStabilityModelType.UpliftVanWti, MStabModelType.UpliftVanWti},
             };
             return translationTable[inputStabilityModelType];
         }
@@ -452,7 +451,8 @@
             {
                 {MStabModelType.Bishop, DesignResultStabilityDesignResultsStabilityModelType.Bishop},
                 {MStabModelType.UpliftVan, DesignResultStabilityDesignResultsStabilityModelType.UpliftVan},
-                {MStabModelType.BishopUpliftVan, DesignResultStabilityDesignResultsStabilityModelType.BishopUpliftVan}
+                {MStabModelType.BishopUpliftVan, DesignResultStabilityDesignResultsStabilityModelType.BishopUpliftVan},
+                {MStabModelType.UpliftVanWti, DesignResultStabilityDesignResultsStabilityModelType.UpliftVanWti}
             };
             return translationTable[stabilityModelType];
         }
@@ -468,7 +468,8 @@
             {
                 {DesignResultStabilityDesignResultsStabilityModelType.Bishop, MStabModelType.Bishop},
                 {DesignResultStabilityDesignResultsStabilityModelType.UpliftVan, MStabModelType.UpliftVan},
-                {DesignResultStabilityDesignResultsStabilityModelType.BishopUpliftVan, MStabModelType.BishopUpliftVan}
+                {DesignResultStabilityDesignResultsStabilityModelType.BishopUpliftVan, MStabModelType.BishopUpliftVan},
+                {DesignResultStabilityDesignResultsStabilityModelType.UpliftVanWti, MStabModelType.UpliftVanWti}
             };
             return translationTable[outputStabilityModelType];
         }
@@ -1023,6 +1024,11 @@
         public const int MStabModelTypeSpencerLow = 9;
 
         /// <summary>
+        /// The m stab model type uplift van Wti
+        /// </summary>
+        public const int MStabModelTypeUpliftVanWti = 10;
+
+        /// <summary>
         /// Converts to MStab Model Type.
         /// </summary>
         /// <param name="inputMStabModelType">The input MStabModelType.</param>
@@ -1040,7 +1046,8 @@
                 {MStabModelTypeHorizontalBalance, MStabModelType.HorizontalBalance},
                 {MStabModelTypeBishopUpliftVan, MStabModelType.BishopUpliftVan},
                 {MStabModelTypeSpencerHigh, MStabModelType.SpencerHigh},
-                {MStabModelTypeSpencerLow, MStabModelType.SpencerLow}
+                {MStabModelTypeSpencerLow, MStabModelType.SpencerLow},
+                {MStabModelTypeUpliftVanWti, MStabModelType.UpliftVanWti}
             };
             return translationTable[inputMStabModelType];
         }
@@ -1063,7 +1070,8 @@
                 {MStabModelType.HorizontalBalance, MStabModelTypeHorizontalBalance},
                 {MStabModelType.BishopUpliftVan, MStabModelTypeBishopUpliftVan},
                 {MStabModelType.SpencerHigh, MStabModelTypeSpencerHigh},
-                {MStabModelType.SpencerLow, MStabModelTypeSpencerLow}
+                {MStabModelType.SpencerLow, MStabModelTypeSpencerLow},
+                {MStabModelType.UpliftVanWti, MStabModelTypeUpliftVanWti}
             };
             return translationTable[mStabModelType];
         }
Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/MacroStabilityInwards/MacroStabilityInwardsKernelWrapperTests.cs
===================================================================
diff -u -r2001 -r2032
--- DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/MacroStabilityInwards/MacroStabilityInwardsKernelWrapperTests.cs	(.../MacroStabilityInwardsKernelWrapperTests.cs)	(revision 2001)
+++ DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/MacroStabilityInwards/MacroStabilityInwardsKernelWrapperTests.cs	(.../MacroStabilityInwardsKernelWrapperTests.cs)	(revision 2032)
@@ -208,20 +208,6 @@
             Assert.AreEqual(double.NaN, macroStabilityOutputItem.SafetyFactor, diff);
         }
 
-        [Test]
-        [TestCase(ModelOptions.Bishop, MStabModelType.Bishop)]
-        [TestCase(ModelOptions.UpliftVan, MStabModelType.UpliftVan)]
-        [TestCase(ModelOptions.UpliftSpencer, MStabModelType.UpliftSpencer)]
-        [TestCase(ModelOptions.Spencer, MStabModelType.Spencer)]
-        [TestCase(ModelOptions.Fellenius, MStabModelType.Fellenius)]
-        [TestCase(ModelOptions.BishopProbabilityRandomField, MStabModelType.BishopRandomField)]
-        [TestCase(ModelOptions.HorizontalBalance, MStabModelType.HorizontalBalance)]
-        public void TestConvertKernelModelOptionsTypeToMStabModelType(ModelOptions modelOptionsType, MStabModelType mStabModelType)
-        {
-            Assert.AreEqual(mStabModelType,
-                MacroStabilityInwardsKernelWrapper.ConvertKernelModelOptionsTypeToMStabModelType(modelOptionsType));
-        }
-
         [TestCase(MacroStability.Standard.LogMessageType.Info, LogMessageType.Info)]
         [TestCase(MacroStability.Standard.LogMessageType.Warning, LogMessageType.Warning)]
         [TestCase(MacroStability.Standard.LogMessageType.Error, LogMessageType.Error)]
@@ -395,7 +381,7 @@
             subSoilScenario.StiFileName = "";
             subSoilScenario.FullStiFileName = "";
             subSoilScenario.SoilProfile2D = DamMacroStabilityTestHelper.CreateSoilProfile2D();
-            subSoilScenario.SegmentFailureMechanismType = FailureMechanismSystemType.WtiStabilityInside;
+            subSoilScenario.SegmentFailureMechanismType = FailureMechanismSystemType.StabilityInside;
 
             var damKernelInput = new DamKernelInput();
             damKernelInput.Location = location;
Index: DamEngine/trunk/src/Deltares.DamEngine.Interface.Tests/ConversionHelperTests.cs
===================================================================
diff -u -r1977 -r2032
--- DamEngine/trunk/src/Deltares.DamEngine.Interface.Tests/ConversionHelperTests.cs	(.../ConversionHelperTests.cs)	(revision 1977)
+++ DamEngine/trunk/src/Deltares.DamEngine.Interface.Tests/ConversionHelperTests.cs	(.../ConversionHelperTests.cs)	(revision 2032)
@@ -204,7 +204,6 @@
         [TestCase(FailureMechanismSystemType.StabilityOutside, 1)]
         [TestCase(FailureMechanismSystemType.Piping, 2)]
         [TestCase(FailureMechanismSystemType.HorizontalBalance, 3)]
-        [TestCase(FailureMechanismSystemType.WtiStabilityInside, 4)]
         public void CanConvertToInputFailureMechanismSystemType(FailureMechanismSystemType failureMechanismSystemType, int inputFailureMechanismSystemType)
         {
             Assert.AreEqual(inputFailureMechanismSystemType, ConversionHelper.ConvertToInputFailureMechanismSystemType(failureMechanismSystemType));
@@ -215,13 +214,32 @@
         [TestCase(1, FailureMechanismSystemType.StabilityOutside)]
         [TestCase(2, FailureMechanismSystemType.Piping)]
         [TestCase(3, FailureMechanismSystemType.HorizontalBalance)]
-        [TestCase(4, FailureMechanismSystemType.WtiStabilityInside)]
         public void CanConvertToFailureMechanismSystemType(int inputFailureMechanismSystemType, FailureMechanismSystemType failureMechanismSystemType)
         {
             Assert.AreEqual(failureMechanismSystemType, ConversionHelper.ConvertToFailureMechanismSystemType(inputFailureMechanismSystemType));
         }
 
         [Test]
+        [TestCase(MStabModelType.Bishop, InputStabilityModelType.Bishop)]
+        [TestCase(MStabModelType.UpliftVan, InputStabilityModelType.UpliftVan)]
+        [TestCase(MStabModelType.BishopUpliftVan, InputStabilityModelType.BishopUpliftVan)]
+        [TestCase(MStabModelType.UpliftVanWti, InputStabilityModelType.UpliftVanWti)]
+        public void CanConvertToInputStabilityModelType(MStabModelType mStabModelType, InputStabilityModelType inputStabilityModelType)
+        {
+            Assert.AreEqual(inputStabilityModelType, ConversionHelper.ConvertToInputStabilityModelType(mStabModelType));
+        }
+
+        [Test]
+        [TestCase(InputStabilityModelType.Bishop, MStabModelType.Bishop)]
+        [TestCase(InputStabilityModelType.UpliftVan, MStabModelType.UpliftVan)]
+        [TestCase(InputStabilityModelType.BishopUpliftVan, MStabModelType.BishopUpliftVan)]
+        [TestCase(InputStabilityModelType.UpliftVanWti, MStabModelType.UpliftVanWti)]
+        public void CanConvertToMStabModelType(InputStabilityModelType inputStabilityModelType, MStabModelType mStabModelType)
+        {
+            Assert.AreEqual(mStabModelType, ConversionHelper.ConvertToStabilityModelType(inputStabilityModelType));
+        }
+
+        [Test]
         [TestCase(AnalysisType.AdaptGeometry, InputAnalysisType.AdaptGeometry)]
         [TestCase(AnalysisType.NoAdaption, InputAnalysisType.NoAdaption)]
         public void CanConvertToInputAnalysisType(AnalysisType analysisType, InputAnalysisType inputAnalysisType)
@@ -464,6 +482,7 @@
         [TestCase(MStabModelType.BishopUpliftVan, ConversionHelper.MStabModelTypeBishopUpliftVan)]
         [TestCase(MStabModelType.SpencerHigh, ConversionHelper.MStabModelTypeSpencerHigh)]
         [TestCase(MStabModelType.SpencerLow, ConversionHelper.MStabModelTypeSpencerLow)]
+        [TestCase(MStabModelType.UpliftVanWti, ConversionHelper.MStabModelTypeUpliftVanWti)]
         public void CanConvertToOutputMStabModelType(MStabModelType mStabModelType, int outputMStabModelType)
         {
             Assert.AreEqual(outputMStabModelType, ConversionHelper.ConvertToOutputMStabModelType(mStabModelType));
@@ -480,6 +499,7 @@
         [TestCase(ConversionHelper.MStabModelTypeBishopUpliftVan, MStabModelType.BishopUpliftVan)]
         [TestCase(ConversionHelper.MStabModelTypeSpencerHigh, MStabModelType.SpencerHigh)]
         [TestCase(ConversionHelper.MStabModelTypeSpencerLow, MStabModelType.SpencerLow)]
+        [TestCase(ConversionHelper.MStabModelTypeUpliftVanWti, MStabModelType.UpliftVanWti)]
         public void CanConvertToMStabModelType(int outputMStabModelType, MStabModelType mStabModelType)
         {
             Assert.AreEqual(mStabModelType, ConversionHelper.ConvertToMStabModelType(outputMStabModelType));
@@ -601,6 +621,7 @@
         [TestCase(DesignResultStabilityDesignResultsStabilityModelType.Bishop, MStabModelType.Bishop)]
         [TestCase(DesignResultStabilityDesignResultsStabilityModelType.UpliftVan, MStabModelType.UpliftVan)]
         [TestCase(DesignResultStabilityDesignResultsStabilityModelType.BishopUpliftVan, MStabModelType.BishopUpliftVan)]
+        [TestCase(DesignResultStabilityDesignResultsStabilityModelType.UpliftVanWti, MStabModelType.UpliftVanWti)]
         public void CanConvertToOutputStabilityModelType(DesignResultStabilityDesignResultsStabilityModelType outputStabilityModelType,
             MStabModelType stabilityModelType)
         {
@@ -611,6 +632,7 @@
         [TestCase(MStabModelType.Bishop, DesignResultStabilityDesignResultsStabilityModelType.Bishop)]
         [TestCase(MStabModelType.UpliftVan, DesignResultStabilityDesignResultsStabilityModelType.UpliftVan)]
         [TestCase(MStabModelType.BishopUpliftVan, DesignResultStabilityDesignResultsStabilityModelType.BishopUpliftVan)]
+        [TestCase(MStabModelType.UpliftVanWti, DesignResultStabilityDesignResultsStabilityModelType.UpliftVanWti)]
         public void CanConvertToStabilityModelType(MStabModelType stabilityModelType,
             DesignResultStabilityDesignResultsStabilityModelType outputStabilityModelType)
         {
Index: DamEngine/trunk/xsd/DamDesignResult.xsd
===================================================================
diff -u -r1958 -r2032
--- DamEngine/trunk/xsd/DamDesignResult.xsd	(.../DamDesignResult.xsd)	(revision 1958)
+++ DamEngine/trunk/xsd/DamDesignResult.xsd	(.../DamDesignResult.xsd)	(revision 2032)
@@ -26,6 +26,7 @@
                 <xs:enumeration value="Bishop" />
                 <xs:enumeration value="UpliftVan" />
                 <xs:enumeration value="BishopUpliftVan" />
+                <xs:enumeration value="UpliftVanWti" />
               </xs:restriction>
             </xs:simpleType>
           </xs:attribute>
Index: DamEngine/trunk/xsd/DamRegionalScenarioResult.xsd
===================================================================
diff -u -r1061 -r2032
--- DamEngine/trunk/xsd/DamRegionalScenarioResult.xsd	(.../DamRegionalScenarioResult.xsd)	(revision 1061)
+++ DamEngine/trunk/xsd/DamRegionalScenarioResult.xsd	(.../DamRegionalScenarioResult.xsd)	(revision 2032)
@@ -58,6 +58,7 @@
                       <xs:enumeration value="BishopUpliftVan" />
                       <xs:enumeration value="SpencerHigh" />
                       <xs:enumeration value="SpencerLow" />
+                      <xs:enumeration value="UpliftVanWti" />
                     </xs:restriction>
                   </xs:simpleType>
                 </xs:attribute>
@@ -152,6 +153,7 @@
           <xs:enumeration value="BishopUpliftVan" />
           <xs:enumeration value="SpencerHigh" />
           <xs:enumeration value="SpencerLow" />
+          <xs:enumeration value="UpliftVanWti" />
         </xs:restriction>
       </xs:simpleType>
     </xs:attribute>
Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators/DikesOperational/OperationalCalculator.cs
===================================================================
diff -u -r1977 -r2032
--- DamEngine/trunk/src/Deltares.DamEngine.Calculators/DikesOperational/OperationalCalculator.cs	(.../OperationalCalculator.cs)	(revision 1977)
+++ DamEngine/trunk/src/Deltares.DamEngine.Calculators/DikesOperational/OperationalCalculator.cs	(.../OperationalCalculator.cs)	(revision 2032)
@@ -328,15 +328,26 @@
             string parameter = "";
             switch (currentSpecification.FailureMechanismSystemType)
             {
-                case FailureMechanismSystemType.WtiStabilityInside:
-                    throw new NotImplementedException();
                 case FailureMechanismSystemType.HorizontalBalance:
                     throw new NotImplementedException();
                 case FailureMechanismSystemType.StabilityOutside:
-                    parameter = TimeSerieParameters.StabilityOutsideFactor.ToString();
-                    break;
+                    if (currentSpecification.StabilityModelType == MStabModelType.Bishop)
+                    {
+                        parameter = TimeSerieParameters.StabilityOutsideFactor.ToString();
+                        break;
+                    }
+                    throw new NotImplementedException();
                 case FailureMechanismSystemType.StabilityInside:
-                    parameter = TimeSerieParameters.StabilityInsideFactor.ToString();
+                    switch (currentSpecification.StabilityModelType)
+                    {
+                        case MStabModelType.Bishop:
+                        case MStabModelType.UpliftVan:
+                        case MStabModelType.BishopUpliftVan:
+                            parameter = TimeSerieParameters.StabilityInsideFactor.ToString();
+                            break;
+                        default:
+                            throw new NotImplementedException();
+                    }
                     break;
                 case FailureMechanismSystemType.Piping:
                     switch (currentSpecification.PipingModelType)
Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/MacroStabilityCommon/ConversionHelperTests.cs
===================================================================
diff -u -r2021 -r2032
--- DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/MacroStabilityCommon/ConversionHelperTests.cs	(.../ConversionHelperTests.cs)	(revision 2021)
+++ DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/MacroStabilityCommon/ConversionHelperTests.cs	(.../ConversionHelperTests.cs)	(revision 2032)
@@ -66,34 +66,32 @@
 
         #region ModelType
         [Test]
-        [TestCase(ModelOptions.Bishop, MStabModelType.Bishop)]
-        [TestCase(ModelOptions.BishopProbabilityRandomField, MStabModelType.BishopRandomField)]
-        [TestCase(ModelOptions.Fellenius, MStabModelType.Fellenius)]
-        [TestCase(ModelOptions.HorizontalBalance, MStabModelType.HorizontalBalance)]
-        [TestCase(ModelOptions.Spencer, MStabModelType.Spencer)]
-        [TestCase(ModelOptions.UpliftSpencer, MStabModelType.UpliftSpencer)]
-        [TestCase(ModelOptions.UpliftVan, MStabModelType.UpliftVan)]
+        [TestCase(ModelOptions.UpliftVan, MStabModelType.UpliftVanWti)]
         public void CanConvertToMStabModelType(ModelOptions modelOption, MStabModelType mStabModelType)
         {
             Assert.AreEqual(mStabModelType, ConversionHelper.ConvertToMStabModelType(modelOption));
         }
 
         [Test]
-        [TestCase(MStabModelType.Bishop, ModelOptions.Bishop)]
-        [TestCase(MStabModelType.BishopRandomField, ModelOptions.BishopProbabilityRandomField)]
-        [TestCase(MStabModelType.Fellenius, ModelOptions.Fellenius)]
-        [TestCase(MStabModelType.HorizontalBalance, ModelOptions.HorizontalBalance)]
-        [TestCase(MStabModelType.Spencer, ModelOptions.Spencer)]
-        [TestCase(MStabModelType.UpliftSpencer, ModelOptions.UpliftSpencer)]
-        [TestCase(MStabModelType.UpliftVan, ModelOptions.UpliftVan)]
+        [TestCase(MStabModelType.UpliftVanWti, ModelOptions.UpliftVan)]
         public void CanConvertToModelOptions(MStabModelType mStabModelType, ModelOptions modelOption)
         {
             Assert.AreEqual(modelOption, ConversionHelper.ConvertToModelOptions(mStabModelType));
         }
 
         [ExpectedException(typeof(ArgumentException))]
+        [TestCase(MStabModelType.Bishop)]
+        [TestCase(MStabModelType.UpliftVan)]
+        [TestCase(MStabModelType.UpliftSpencer)]
         [TestCase(MStabModelType.SpencerLow)]
         [TestCase(MStabModelType.SpencerHigh)]
+        [TestCase(MStabModelType.BishopUpliftVan)]
+        [TestCase(MStabModelType.BishopRandomField)]
+        [TestCase(MStabModelType.Fellenius)]
+        [TestCase(MStabModelType.BishopWti)]
+        [TestCase(MStabModelType.HorizontalBalance)]
+        [TestCase(MStabModelType.Spencer)]
+        [TestCase(MStabModelType.UpliftSpencerWti)]
         public void CanConvertToModelOptionsHandleException(MStabModelType mStabModelType)
         {
             ConversionHelper.ConvertToModelOptions(mStabModelType);
@@ -146,6 +144,9 @@
             // Then result equals original
             var compare = new CompareLogic { Config = { MaxDifferences = 100 } };
             var result = compare.Compare(macroStabilitySoil, actualMacroStabilitySoil);
+            // For now, 3 errors are expected (RRatio, RheologicalCoefficient and StrengthIncreaseExponent). 
+            Assert.AreEqual(3, result.Differences.Count, "Differences found converting/reconverting Soil");
+            // But in future, this mus succeed.
             Assert.AreEqual(0, result.Differences.Count, "Differences found converting/reconverting Soil");
         }
         #endregion
Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/MacroStabilityInwards/MacroStabilityInwardsKernelWrapper.cs
===================================================================
diff -u -r2001 -r2032
--- DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/MacroStabilityInwards/MacroStabilityInwardsKernelWrapper.cs	(.../MacroStabilityInwardsKernelWrapper.cs)	(revision 2001)
+++ DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/MacroStabilityInwards/MacroStabilityInwardsKernelWrapper.cs	(.../MacroStabilityInwardsKernelWrapper.cs)	(revision 2032)
@@ -79,7 +79,7 @@
                 CalculationResult = CalculationResult.NoRun
             };
             kernelDataOutput = macroStabilityOutput;
-            if (damKernelInput.SubSoilScenario.SegmentFailureMechanismType == FailureMechanismSystemType.WtiStabilityInside)
+            if (damKernelInput.SubSoilScenario.SegmentFailureMechanismType == FailureMechanismSystemType.StabilityInside)
             {
                 try
                 {
@@ -275,7 +275,7 @@
             macroStabilityOutputItem.SafetyFactor = calculationResults.FactorOfSafety;
             macroStabilityOutputItem.CircleSurfacePointLeftXCoordinate = calculationResults.XMinEntry;
             macroStabilityOutputItem.CircleSurfacePointRightXCoordinate = calculationResults.XMaxEntry;
-            macroStabilityOutputItem.StabilityModelType = ConvertKernelModelOptionsTypeToMStabModelType(calculationResults.ModelOption);
+            macroStabilityOutputItem.StabilityModelType = ConversionHelper.ConvertToMStabModelType(calculationResults.ModelOption);
             foreach (var message in calculationResults.Messages)
             {
                 messages.Add(new LogMessage
@@ -286,21 +286,6 @@
             }
         }
 
-        internal static MStabModelType ConvertKernelModelOptionsTypeToMStabModelType(ModelOptions modelOption)
-        {
-            var translationTable = new Dictionary<ModelOptions, MStabModelType>()
-            {
-                {ModelOptions.Bishop, MStabModelType.Bishop},
-                {ModelOptions.UpliftVan, MStabModelType.UpliftVan},
-                {ModelOptions.UpliftSpencer, MStabModelType.UpliftSpencer},
-                {ModelOptions.Spencer, MStabModelType.Spencer},
-                {ModelOptions.Fellenius, MStabModelType.Fellenius},
-                {ModelOptions.BishopProbabilityRandomField, MStabModelType.BishopRandomField},
-                {ModelOptions.HorizontalBalance, MStabModelType.HorizontalBalance},
-            };
-            return translationTable[modelOption];
-        }
-
         internal static LogMessageType ConvertKernelLogMessageTypeToLogMessageType(MacroStability.Standard.LogMessageType messageType)
         {
             var translationTable = new Dictionary<MacroStability.Standard.LogMessageType, LogMessageType>()
Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/MacroStabilityCommon/MacroStabilityIo/ConversionHelper.cs
===================================================================
diff -u -r2018 -r2032
--- DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/MacroStabilityCommon/MacroStabilityIo/ConversionHelper.cs	(.../ConversionHelper.cs)	(revision 2018)
+++ DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/MacroStabilityCommon/MacroStabilityIo/ConversionHelper.cs	(.../ConversionHelper.cs)	(revision 2032)
@@ -76,15 +76,10 @@
         /// <returns>the Dam MStabModelType</returns>
         public static MStabModelType ConvertToMStabModelType(ModelOptions modelOption)
         {
+            // For the macrostability kernel, the only supported option for now is UpliftVan.
             var translationTable = new Dictionary<ModelOptions, MStabModelType>()
             {
-                {ModelOptions.Bishop, MStabModelType.Bishop},
-                {ModelOptions.BishopProbabilityRandomField, MStabModelType.BishopRandomField},
-                {ModelOptions.Fellenius, MStabModelType.Fellenius},
-                {ModelOptions.HorizontalBalance, MStabModelType.HorizontalBalance},
-                {ModelOptions.Spencer, MStabModelType.Spencer},
-                {ModelOptions.UpliftSpencer, MStabModelType.UpliftSpencer},
-                {ModelOptions.UpliftVan, MStabModelType.UpliftVan}
+                {ModelOptions.UpliftVan, MStabModelType.UpliftVanWti}
             };
             return translationTable[modelOption];
         }
@@ -95,19 +90,14 @@
         /// <exception cref="System.ArgumentException"></exception>
         public static ModelOptions ConvertToModelOptions(MStabModelType mStabModelType)
         {
-            if (mStabModelType == MStabModelType.SpencerHigh || mStabModelType == MStabModelType.SpencerLow)
+            // For the macrostability kernel, the only supported option for now is UpliftVan.
+            if (mStabModelType != MStabModelType.UpliftVanWti)
             {
                 throw new ArgumentException(String.Format("Unsupported MStabModelType: {0}", mStabModelType));
             }
             var translationTable = new Dictionary<MStabModelType, ModelOptions>()
             {
-                {MStabModelType.Bishop, ModelOptions.Bishop},
-                {MStabModelType.BishopRandomField, ModelOptions.BishopProbabilityRandomField},
-                {MStabModelType.Fellenius, ModelOptions.Fellenius},
-                {MStabModelType.HorizontalBalance, ModelOptions.HorizontalBalance},
-                {MStabModelType.Spencer, ModelOptions.Spencer},
-                {MStabModelType.UpliftSpencer, ModelOptions.UpliftSpencer},
-                {MStabModelType.UpliftVan, ModelOptions.UpliftVan}
+                {MStabModelType.UpliftVanWti, ModelOptions.UpliftVan}
             };
             return translationTable[mStabModelType];
         }
Index: DamEngine/trunk/xsd/DamInput.xsd
===================================================================
diff -u -r1977 -r2032
--- DamEngine/trunk/xsd/DamInput.xsd	(.../DamInput.xsd)	(revision 1977)
+++ DamEngine/trunk/xsd/DamInput.xsd	(.../DamInput.xsd)	(revision 2032)
@@ -120,7 +120,6 @@
           <xs:enumeration value="StabilityOutside" />
           <xs:enumeration value="Piping" />
           <xs:enumeration value="HorizontalBalance" />
-          <xs:enumeration value="WtiStabilityInside" />
         </xs:restriction>
       </xs:simpleType>
     </xs:attribute>
@@ -140,6 +139,7 @@
           <xs:enumeration value="Bishop" />
           <xs:enumeration value="UpliftVan" />
           <xs:enumeration value="BishopUpliftVan" />
+          <xs:enumeration value="UpliftVanWti" />
         </xs:restriction>
       </xs:simpleType>
     </xs:attribute>
Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/Common/KernelWrapperHelper.cs
===================================================================
diff -u -r1983 -r2032
--- DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/Common/KernelWrapperHelper.cs	(.../KernelWrapperHelper.cs)	(revision 1983)
+++ DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/Common/KernelWrapperHelper.cs	(.../KernelWrapperHelper.cs)	(revision 2032)
@@ -44,32 +44,49 @@
         /// <returns></returns>
         /// <exception cref="System.NotImplementedException">
         /// </exception>
-        public static IKernelWrapper CreateKernelWrapper(DamFailureMechanismeCalculationSpecification currentSpecification)
+        public static IKernelWrapper CreateKernelWrapper(
+            DamFailureMechanismeCalculationSpecification currentSpecification)
         {
             IKernelWrapper kernelWrapper = null;
             switch (currentSpecification.FailureMechanismSystemType)
             {
                 case FailureMechanismSystemType.HorizontalBalance:
                     kernelWrapper = new DamMacroStabilityHorizontalBalanceKernelWrapper();
-                    var damMacroStabilityHorizontalBalanceKernelWrapper = (DamMacroStabilityHorizontalBalanceKernelWrapper) kernelWrapper;
-                    damMacroStabilityHorizontalBalanceKernelWrapper.FailureMechanismParametersMStab = currentSpecification.FailureMechanismParametersMStab;
+                    var damMacroStabilityHorizontalBalanceKernelWrapper =
+                        (DamMacroStabilityHorizontalBalanceKernelWrapper) kernelWrapper;
+                    damMacroStabilityHorizontalBalanceKernelWrapper.FailureMechanismParametersMStab =
+                        currentSpecification.FailureMechanismParametersMStab;
                     break;
                 case FailureMechanismSystemType.StabilityOutside:
-                    kernelWrapper = new DamMacroStabilityOutwardsKernelWrapper();
-                    var damMacroStabilityOutwardsKernelWrapper = (DamMacroStabilityOutwardsKernelWrapper)kernelWrapper;
-                    damMacroStabilityOutwardsKernelWrapper.FailureMechanismParametersMStab = currentSpecification.FailureMechanismParametersMStab;
-                    break;
+                    if (currentSpecification.StabilityModelType == MStabModelType.Bishop)
+                    {
+                        kernelWrapper = new DamMacroStabilityOutwardsKernelWrapper();
+                        var damMacroStabilityOutwardsKernelWrapper =
+                            (DamMacroStabilityOutwardsKernelWrapper) kernelWrapper;
+                        damMacroStabilityOutwardsKernelWrapper.FailureMechanismParametersMStab =
+                            currentSpecification.FailureMechanismParametersMStab;
+                        break;
+                    }
+                    throw new NotImplementedException();
                 case FailureMechanismSystemType.StabilityInside:
-                    kernelWrapper = new DamMacroStabilityInwardsKernelWrapper();
-                    var damMacroStabilityKernelWrapper = (DamMacroStabilityInwardsKernelWrapper)kernelWrapper;
-                    damMacroStabilityKernelWrapper.FailureMechanismParametersMStab = currentSpecification.FailureMechanismParametersMStab.Copy();
-                    break;
-                case FailureMechanismSystemType.WtiStabilityInside:
-                    kernelWrapper = new MacroStabilityInwardsKernelWrapper();
-                    var wtiMacroStabilityInwardsKernelWrapper = (MacroStabilityInwardsKernelWrapper)kernelWrapper;
-                    wtiMacroStabilityInwardsKernelWrapper.FailureMechanismParametersMStab = 
-                        currentSpecification.FailureMechanismParametersMStab.Copy();
-                    break;
+                    switch (currentSpecification.StabilityModelType)
+                    {
+                        case MStabModelType.Bishop:
+                        case MStabModelType.UpliftVan:
+                        case MStabModelType.BishopUpliftVan:
+                            kernelWrapper = new DamMacroStabilityInwardsKernelWrapper();
+                            var damMacroStabilityKernelWrapper = (DamMacroStabilityInwardsKernelWrapper)kernelWrapper;
+                            damMacroStabilityKernelWrapper.FailureMechanismParametersMStab = currentSpecification.FailureMechanismParametersMStab.Copy();
+                            break;
+                        case MStabModelType.UpliftVanWti:
+                            kernelWrapper = new MacroStabilityInwardsKernelWrapper();
+                            var wtiMacroStabilityInwardsKernelWrapper = (MacroStabilityInwardsKernelWrapper)kernelWrapper;
+                            wtiMacroStabilityInwardsKernelWrapper.FailureMechanismParametersMStab = currentSpecification.FailureMechanismParametersMStab.Copy();
+                            break;
+                        default:
+                            throw new NotImplementedException();
+                    }
+                    break;            
                 case FailureMechanismSystemType.Piping:
                     switch (currentSpecification.PipingModelType)
                     {
Index: DamEngine/trunk/src/Deltares.DamEngine.Data/General/DAMEnumerations.cs
===================================================================
diff -u -r1977 -r2032
--- DamEngine/trunk/src/Deltares.DamEngine.Data/General/DAMEnumerations.cs	(.../DAMEnumerations.cs)	(revision 1977)
+++ DamEngine/trunk/src/Deltares.DamEngine.Data/General/DAMEnumerations.cs	(.../DAMEnumerations.cs)	(revision 2032)
@@ -45,8 +45,7 @@
         StabilityInside,
         StabilityOutside,
         Piping,
-        HorizontalBalance,
-        WtiStabilityInside
+        HorizontalBalance
     }
 
     // TODO: FM this is failure mechanism specific code and should be moved to ..\KernelWrappers
@@ -61,7 +60,10 @@
         HorizontalBalance,
         BishopUpliftVan,
         SpencerHigh,   // #Bka added SpencerHigh/SpencerLow as quick fix. Should be replaced with options for Spencer later! These enums should be removed.
-        SpencerLow
+        SpencerLow,
+        BishopWti,     // #Bka: for now, only UpliftVanWti is to be used of all Wti options.
+        UpliftVanWti, 
+        UpliftSpencerWti
     }
 
     // TODO: FM this is failure mechanism specific code and should be moved to ..\KernelWrappers
Index: DamEngine/trunk/src/Deltares.DamEngine.Io/DamOutput.cs
===================================================================
diff -u -r1977 -r2032
--- DamEngine/trunk/src/Deltares.DamEngine.Io/DamOutput.cs	(.../DamOutput.cs)	(revision 1977)
+++ DamEngine/trunk/src/Deltares.DamEngine.Io/DamOutput.cs	(.../DamOutput.cs)	(revision 2032)
@@ -1692,6 +1692,9 @@
         
         /// <remarks/>
         BishopUpliftVan,
+        
+        /// <remarks/>
+        UpliftVanWti,
     }
     
     /// <remarks/>