Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/MacroStabilityInwards/MacroStabilityKernelDataInput.cs
===================================================================
diff -u -r6479 -r6506
--- DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/MacroStabilityInwards/MacroStabilityKernelDataInput.cs	(.../MacroStabilityKernelDataInput.cs)	(revision 6479)
+++ DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/MacroStabilityInwards/MacroStabilityKernelDataInput.cs	(.../MacroStabilityKernelDataInput.cs)	(revision 6506)
@@ -22,6 +22,7 @@
 using Deltares.DamEngine.Calculators.KernelWrappers.Common;
 using Deltares.DamEngine.Calculators.KernelWrappers.Interfaces;
 using Deltares.DamEngine.Data.General;
+using Deltares.DamEngine.Data.Geometry;
 using Deltares.MacroStability.Io.XmlInput;
 
 namespace Deltares.DamEngine.Calculators.KernelWrappers.MacroStabilityInwards;
@@ -34,10 +35,10 @@
     /// <value>
     /// The input.
     /// </value>
-    public FullInputModelType Input { get; set; } = new FullInputModelType();
-    
+    public FullInputModelType Input { get; set; } = new();
+
     public DamKernelInput DamKernelInput { get; set; }
-    public MStabParameters MStabParameters { get; set; } 
-    public Deltares.DamEngine.Data.Geometry.Waternet WaterNet { get; set; }
+    public MStabParameters MStabParameters { get; set; }
+    public Waternet WaterNet { get; set; }
     public double XCoordinateLowestUpliftFactorPoint { get; set; }
 }
\ No newline at end of file
Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/MacroStabilityInwards/MacroStabilityInwardsKernelWrapper.cs
===================================================================
diff -u -r6503 -r6506
--- DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/MacroStabilityInwards/MacroStabilityInwardsKernelWrapper.cs	(.../MacroStabilityInwardsKernelWrapper.cs)	(revision 6503)
+++ DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/MacroStabilityInwards/MacroStabilityInwardsKernelWrapper.cs	(.../MacroStabilityInwardsKernelWrapper.cs)	(revision 6506)
@@ -128,7 +128,7 @@
                         return PrepareResult.NotRelevant;
                     }
                 }
-                
+
                 FailureMechanismParametersMStab.MStabParameters.Model = model;
 
                 macroStabilityInput.WaterNet = waterNet;
@@ -219,24 +219,18 @@
             macroStabilityKernelDataInput.MStabParameters.Model = StabilityModelType.Bishop;
         }
 
-        MacroStabilityCommonHelper.PerformStabilityCalculation(macroStabilityKernelDataInput.DamKernelInput,
-                                                               macroStabilityKernelDataInput.MStabParameters,
-                                                               macroStabilityKernelDataInput.WaterNet,
-                                                               macroStabilityKernelDataInput.XCoordinateLowestUpliftFactorPoint,
-                                                               macroStabilityOutput,
-                                                               fileNameForCalculation, stabilityCalculator, out messages);
+        MacroStabilityCommonHelper.PerformStabilityCalculation(macroStabilityKernelDataInput,
+                                                               macroStabilityOutput, fileNameForCalculation,
+                                                               stabilityCalculator, out messages);
         AddFileNameToLogMessages(messages, fileNameForCalculation);
 
         if (isBishopUpliftVan && macroStabilityOutput.UpliftSituation.IsUplift)
         {
             macroStabilityKernelDataInput.Input.StabilityModel.ModelOption = StabilityModelOption.UpliftVan;
             macroStabilityKernelDataInput.MStabParameters.Model = StabilityModelType.UpliftVan;
-            MacroStabilityCommonHelper.PerformStabilityCalculation(macroStabilityKernelDataInput.DamKernelInput,
-                                                                   macroStabilityKernelDataInput.MStabParameters,
-                                                                   macroStabilityKernelDataInput.WaterNet,
-                                                                   macroStabilityKernelDataInput.XCoordinateLowestUpliftFactorPoint,
-                                                                   macroStabilityOutput,
-                                                                   fileNameForSecondCalculation, stabilityCalculatorForSecondCalculation, out messages);
+            MacroStabilityCommonHelper.PerformStabilityCalculation(macroStabilityKernelDataInput,
+                                                                   macroStabilityOutput, fileNameForSecondCalculation,
+                                                                   stabilityCalculatorForSecondCalculation, out messages);
             AddFileNameToLogMessages(messages, fileNameForSecondCalculation);
         }
     }
Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/MacroStabilityOutwards/MacroStabilityOutwardsKernelWrapper.cs
===================================================================
diff -u -r6483 -r6506
--- DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/MacroStabilityOutwards/MacroStabilityOutwardsKernelWrapper.cs	(.../MacroStabilityOutwardsKernelWrapper.cs)	(revision 6483)
+++ DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/MacroStabilityOutwards/MacroStabilityOutwardsKernelWrapper.cs	(.../MacroStabilityOutwardsKernelWrapper.cs)	(revision 6506)
@@ -107,7 +107,7 @@
                 FailureMechanismParametersMStab.MStabParameters.GridPosition = StabilityGridPosition.Left;
                 damKernelInput.DamFailureMechanismeCalculationSpecification.FailureMechanismParametersMStab
                               .MStabParameters.GridPosition = StabilityGridPosition.Left;
-                
+
                 macroStabilityInput.Input = FillMacroStabilityKernelInputFromEngine.CreateFullInputModel(damKernelInput, FailureMechanismParametersMStab.MStabParameters, waterNet, 0.0);
                 fileNameForCalculation = MacroStabilityCommonHelper.GetStabilityInputFileName(damKernelInput, iterationIndex, FailureMechanismParametersMStab.MStabParameters.Model);
                 stabilityCalculator = new MacroStabilityInterface(macroStabilityInput.Input);
@@ -158,12 +158,9 @@
         MacroStabilityCommonHelper.ThrowWhenMacroStabilityKernelInputNull(macroStabilityKernelDataInput);
         MacroStabilityCommonHelper.ThrowWhenMacroStabilityKernelOutputNull(macroStabilityOutput);
 
-        MacroStabilityCommonHelper.PerformStabilityCalculation(macroStabilityKernelDataInput.DamKernelInput, 
-                                                               macroStabilityKernelDataInput.MStabParameters, 
-                                                               macroStabilityKernelDataInput.WaterNet, 
-                                                               macroStabilityKernelDataInput.XCoordinateLowestUpliftFactorPoint, 
-                                                               macroStabilityOutput, fileNameForCalculation, stabilityCalculator, 
-                                                               out messages);
+        MacroStabilityCommonHelper.PerformStabilityCalculation(macroStabilityKernelDataInput,
+                                                               macroStabilityOutput, fileNameForCalculation,
+                                                               stabilityCalculator, out messages);
         string fileName = Path.GetFileNameWithoutExtension(fileNameForCalculation);
         foreach (LogMessage logMessage in messages)
         {
Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/MacroStabilityCommon/MacroStabilityCommonHelper.cs
===================================================================
diff -u -r6501 -r6506
--- DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/MacroStabilityCommon/MacroStabilityCommonHelper.cs	(.../MacroStabilityCommonHelper.cs)	(revision 6501)
+++ DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/MacroStabilityCommon/MacroStabilityCommonHelper.cs	(.../MacroStabilityCommonHelper.cs)	(revision 6506)
@@ -411,17 +411,12 @@
     /// <summary>
     /// Performs the stability calculation.
     /// </summary>
-    /// <param name="input">The input.</param>
-    /// <param name="xCoordinateLowestUpliftFactorPoint"></param>
+    /// <param name="macroStabilityKernelDataInput"></param>
     /// <param name="macroStabilityOutput">The macro stability output.</param>
     /// <param name="fileName">Name of the file.</param>
     /// <param name="calculator">The calculator.</param>
     /// <param name="errorMessages">The error messages.</param>
-    /// <param name="damKernelInput"></param>
-    /// <param name="mStabParameters"></param>
-    /// <param name="waterNet"></param>
-    public static void PerformStabilityCalculation(DamKernelInput damKernelInput, MStabParameters mStabParameters,
-                                                   Waternet waterNet, double xCoordinateLowestUpliftFactorPoint,
+    public static void PerformStabilityCalculation(MacroStabilityKernelDataInput macroStabilityKernelDataInput,
                                                    MacroStabilityOutput macroStabilityOutput, string fileName,
                                                    MacroStabilityInterface calculator, out List<LogMessage> errorMessages)
     {
@@ -450,11 +445,14 @@
 
         if (macroStabilityOutput.CalculationResult != CalculationResult.UnexpectedError)
         {
-            StixFileWriterConnector.WriteStixFileWithInput(damKernelInput, mStabParameters, waterNet,
-                                                           xCoordinateLowestUpliftFactorPoint, macroStabilityOutput,
-                                                           fileName, new List<LogMessage>());
-            StixFileWriterConnector.WriteStixFileWithInputAndResults(damKernelInput, mStabParameters, waterNet,
-                                                                     xCoordinateLowestUpliftFactorPoint, macroStabilityOutput, fileName, errorMessages);
+            StixFileWriterConnector.WriteStixFileWithInput(macroStabilityKernelDataInput.DamKernelInput, macroStabilityKernelDataInput.MStabParameters,
+                                                           macroStabilityKernelDataInput.WaterNet,
+                                                           macroStabilityKernelDataInput.XCoordinateLowestUpliftFactorPoint,
+                                                           macroStabilityOutput, fileName, new List<LogMessage>());
+            StixFileWriterConnector.WriteStixFileWithInputAndResults(macroStabilityKernelDataInput.DamKernelInput, macroStabilityKernelDataInput.MStabParameters,
+                                                                     macroStabilityKernelDataInput.WaterNet,
+                                                                     macroStabilityKernelDataInput.XCoordinateLowestUpliftFactorPoint,
+                                                                     macroStabilityOutput, fileName, errorMessages);
         }
     }