Index: DamClients/DamLive/trunk/src/Deltares.DamLive.Application/DamEngineRunner.cs
===================================================================
diff -u -r6954 -r6965
--- DamClients/DamLive/trunk/src/Deltares.DamLive.Application/DamEngineRunner.cs	(.../DamEngineRunner.cs)	(revision 6954)
+++ DamClients/DamLive/trunk/src/Deltares.DamLive.Application/DamEngineRunner.cs	(.../DamEngineRunner.cs)	(revision 6965)
@@ -282,52 +282,52 @@
         }
         
         //perhaps is some sort of test needed before reading parameters file like
-        //DamProjectData.DamProjectCalculationSpecification.CurrentSpecification.CalculationModel == null &&
+        //DamProjectData.DamProjectCalculationSpecification.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);
-            DamProjectData.DamProjectCalculationSpecification.CurrentSpecification = 
+            DamProjectData.DamProjectCalculationSpecification = 
                 FillDomainFromXmlCalculationParameters.CreateCalculationParameters(xmlCalculationParameters);
         }
     }
 
     private void RunSelectedModels()
     {
-        if (DamProjectData.DamProjectCalculationSpecification.CurrentSpecification == null)
+        if (DamProjectData.DamProjectCalculationSpecification == null)
         {
             Logger.LogError("No calculation models selected");
             return;
         }
 
-        if (DamProjectData.DamProjectCalculationSpecification.CurrentSpecification.FailureMechanismSystemType == FailureMechanismSystemType.StabilityInside)
+        if (DamProjectData.DamProjectCalculationSpecification.FailureMechanismSystemType == FailureMechanismSystemType.StabilityInside)
         {
             RunStability(FailureMechanismSystemType.StabilityInside);
         }
 
-        if (DamProjectData.DamProjectCalculationSpecification.CurrentSpecification.FailureMechanismSystemType == FailureMechanismSystemType.StabilityOutside)
+        if (DamProjectData.DamProjectCalculationSpecification.FailureMechanismSystemType == FailureMechanismSystemType.StabilityOutside)
         {
             RunStability(FailureMechanismSystemType.StabilityOutside);
         }
 
-        if (DamProjectData.DamProjectCalculationSpecification.CurrentSpecification.FailureMechanismSystemType == FailureMechanismSystemType.Piping &&
-            DamProjectData.DamProjectCalculationSpecification.CurrentSpecification.PipingModelType == PipingModelType.Bligh)
+        if (DamProjectData.DamProjectCalculationSpecification.FailureMechanismSystemType == FailureMechanismSystemType.Piping &&
+            DamProjectData.DamProjectCalculationSpecification.PipingModelType == PipingModelType.Bligh)
         {
             Logger.LogError("Calculation module PipingBligh not implemented yet");
         }
 
-        if (DamProjectData.DamProjectCalculationSpecification.CurrentSpecification.FailureMechanismSystemType == FailureMechanismSystemType.Piping &&
-            DamProjectData.DamProjectCalculationSpecification.CurrentSpecification.PipingModelType == PipingModelType.Wti2017)
+        if (DamProjectData.DamProjectCalculationSpecification.FailureMechanismSystemType == FailureMechanismSystemType.Piping &&
+            DamProjectData.DamProjectCalculationSpecification.PipingModelType == PipingModelType.Wti2017)
         {
             RunPiping(FailureMechanismSystemType.Piping);
         }
     }
 
     private void RunStability(FailureMechanismSystemType failureMechanismSystemType)
     {
-        ReadUserSettingsSlipCircleDefinition(DamProjectData.DamProjectCalculationSpecification.CurrentSpecification.SlipCircleDefinition);
-        DamProjectData.DamProjectCalculationSpecification.CurrentSpecification.FailureMechanismSystemType = failureMechanismSystemType;
+        ReadUserSettingsSlipCircleDefinition(DamProjectData.DamProjectCalculationSpecification.DamStabilityParameters.SlipCircleDefinition);
+        DamProjectData.DamProjectCalculationSpecification.FailureMechanismSystemType = failureMechanismSystemType;
         
         CallDamEngine();
         if (DamProjectData.OutputTimeSerieCollection != null && DamProjectData.OutputTimeSerieCollection.Series.Count > 0)
@@ -338,7 +338,7 @@
 
     private void RunPiping(FailureMechanismSystemType failureMechanismSystemType)
     {
-        DamProjectData.DamProjectCalculationSpecification.CurrentSpecification.FailureMechanismSystemType = failureMechanismSystemType;
+        DamProjectData.DamProjectCalculationSpecification.FailureMechanismSystemType = failureMechanismSystemType;
 
         CallDamEngine();
         if (DamProjectData.OutputTimeSerieCollection != null && DamProjectData.OutputTimeSerieCollection.Series.Count > 0)