Index: DamClients/DamLive/trunk/src/Deltares.DamLive.Application/DamEngineRunner.cs
===================================================================
diff -u -r6818 -r6953
--- DamClients/DamLive/trunk/src/Deltares.DamLive.Application/DamEngineRunner.cs	(.../DamEngineRunner.cs)	(revision 6818)
+++ DamClients/DamLive/trunk/src/Deltares.DamLive.Application/DamEngineRunner.cs	(.../DamEngineRunner.cs)	(revision 6953)
@@ -66,14 +66,6 @@
     public DamProjectData DamProjectData { get; set; }
 
     /// <summary>
-    /// Gets or sets the calculation parameters.
-    /// </summary>
-    /// <value>
-    /// The calculation parameters.
-    /// </value>
-    public CalculationParameters CalculationParameters { get; set; }
-
-    /// <summary>
     /// Gets or sets the output time series collection.
     /// </summary>
     /// <value>
@@ -289,51 +281,55 @@
 
             OutputTimeSeriesCollection = InputTimeSeriesCollection.GetShallowCopy();
         }
-
-        if (CalculationParameters == null && ParametersFile != null)
+        
+        //perhaps is some sort of test needed before reading parameters file like
+        //DamProjectData.DamProjectCalculationSpecification.CurrentSpecification.CalculationModel == null &&
+        //but that depends on what should prevail if both files are present
+        if (ParametersFile != null)
         {
             // Read calculation parameters, if available
             XmlCalculationParameters xmlCalculationParameters = CalculationParametersXmlSerialization.LoadFromXmlFile(ParametersFile.FullName);
-            CalculationParameters = FillDomainFromXmlCalculationParameters.CreateCalculationParameters(xmlCalculationParameters);
+            DamProjectData.DamProjectCalculationSpecification.CurrentSpecification = 
+                FillDomainFromXmlCalculationParameters.CreateCalculationParameters(xmlCalculationParameters);
         }
     }
 
     private void RunSelectedModels()
     {
-        if (CalculationParameters?.CalculationModules == null)
+        if (DamProjectData.DamProjectCalculationSpecification.CurrentSpecification == null)
         {
-            Logger.LogError("No calculation modules selected");
+            Logger.LogError("No calculation models selected");
             return;
         }
 
-        if (CalculationParameters.CalculationModules.StabilityInside)
+        if (DamProjectData.DamProjectCalculationSpecification.CurrentSpecification.FailureMechanismSystemType == FailureMechanismSystemType.StabilityInside)
         {
             RunStability(FailureMechanismSystemType.StabilityInside);
         }
 
-        if (CalculationParameters.CalculationModules.StabilityOutside)
+        if (DamProjectData.DamProjectCalculationSpecification.CurrentSpecification.FailureMechanismSystemType == FailureMechanismSystemType.StabilityOutside)
         {
             RunStability(FailureMechanismSystemType.StabilityOutside);
         }
 
-        if (CalculationParameters.CalculationModules.PipingBligh)
+        if (DamProjectData.DamProjectCalculationSpecification.CurrentSpecification.FailureMechanismSystemType == FailureMechanismSystemType.Piping &&
+            DamProjectData.DamProjectCalculationSpecification.CurrentSpecification.PipingModelType == PipingModelType.Bligh)
         {
             Logger.LogError("Calculation module PipingBligh not implemented yet");
         }
 
-        if (CalculationParameters.CalculationModules.PipingWti)
+        if (DamProjectData.DamProjectCalculationSpecification.CurrentSpecification.FailureMechanismSystemType == FailureMechanismSystemType.Piping &&
+            DamProjectData.DamProjectCalculationSpecification.CurrentSpecification.PipingModelType == PipingModelType.Wti2017)
         {
             RunPiping(FailureMechanismSystemType.Piping);
         }
     }
 
     private void RunStability(FailureMechanismSystemType failureMechanismSystemType)
     {
-        ReadUserSettingsSlipCircleDefinition(CalculationParameters.StabilityParameters.SlipCircleDefinition);
+        ReadUserSettingsSlipCircleDefinition(DamProjectData.DamProjectCalculationSpecification.CurrentSpecification.SlipCircleDefinition);
         DamProjectData.DamProjectCalculationSpecification.CurrentSpecification.FailureMechanismSystemType = failureMechanismSystemType;
-        DamProjectData.DamProjectCalculationSpecification.CurrentSpecification.StabilityParameters.MStabParameters =
-            CalculationParameters.StabilityParameters;
-
+        
         CallDamEngine();
         if (DamProjectData.OutputTimeSerieCollection != null && DamProjectData.OutputTimeSerieCollection.Series.Count > 0)
         {