Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/MacroStabilityOutwards/MacroStabilityOutwardsKernelWrapper.cs
===================================================================
diff -u -r6404 -r6479
--- DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/MacroStabilityOutwards/MacroStabilityOutwardsKernelWrapper.cs	(.../MacroStabilityOutwardsKernelWrapper.cs)	(revision 6404)
+++ DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/MacroStabilityOutwards/MacroStabilityOutwardsKernelWrapper.cs	(.../MacroStabilityOutwardsKernelWrapper.cs)	(revision 6479)
@@ -37,7 +37,7 @@
 using Deltares.DamEngine.Data.Standard;
 using Deltares.DamEngine.Data.Standard.Calculation;
 using Deltares.DamEngine.Data.Standard.Logging;
-using Deltares.MacroStability.CSharpWrapper;
+using Deltares.MacroStability.Interface;
 using Point2D = Deltares.DamEngine.Data.Geometry.Point2D;
 
 namespace Deltares.DamEngine.Calculators.KernelWrappers.MacroStabilityOutwards;
@@ -49,7 +49,7 @@
 public class MacroStabilityOutwardsKernelWrapper : IKernelWrapper
 {
     readonly MacroStabilityCommonHelper macroStabilityCommonHelper;
-    private Calculator stabilityCalculator;
+    private MacroStabilityInterface stabilityCalculator;
     private string fileNameForCalculation;
 
     /// <summary>
@@ -113,18 +113,13 @@
                 PlLines plLines = upliftHelper.DeterminePlLinesForStability(damKernelInput, useRiverLevelLow, out _);
                 Waternet waterNet = MacroStabilityCommonHelper.CreateWaternet(damKernelInput, plLines);
 
-                var fillMacroStabilityWrapperFromEngine = new FillMacroStabilityWrapperInputFromEngine
-                {
-                    TrafficLoad = MacroStabilityCommonHelper.FillTrafficLoad(damKernelInput)
-                };
                 FailureMechanismParametersMStab.MStabParameters.GridPosition = StabilityGridPosition.Left;
                 damKernelInput.DamFailureMechanismeCalculationSpecification.FailureMechanismParametersMStab
                               .MStabParameters.GridPosition = StabilityGridPosition.Left;
-                fillMacroStabilityWrapperFromEngine.BishopCalculationGrid = MacroStabilityCommonHelper.FillBishopCalculationGrid(damKernelInput);
-
-                macroStabilityInput.Input = fillMacroStabilityWrapperFromEngine.CreateMacroStabilityInput(damKernelInput, FailureMechanismParametersMStab.MStabParameters, waterNet);
+                
+                macroStabilityInput.Input = FillMacroStabilityKernelInputFromEngine.CreateFullInputModel(damKernelInput, FailureMechanismParametersMStab.MStabParameters, waterNet, 0.0);
                 fileNameForCalculation = MacroStabilityCommonHelper.GetStabilityInputFileName(damKernelInput, iterationIndex, FailureMechanismParametersMStab.MStabParameters.Model);
-                stabilityCalculator = new Calculator(macroStabilityInput.Input);
+                stabilityCalculator = new MacroStabilityInterface(macroStabilityInput.Input);
                 PrepareResult firstPrepareResult = MacroStabilityCommonHelper.PrepareKernel(stabilityCalculator, fileNameForCalculation);
 
                 return firstPrepareResult;
@@ -172,8 +167,12 @@
         MacroStabilityCommonHelper.ThrowWhenMacroStabilityKernelInputNull(macroStabilityKernelDataInput);
         MacroStabilityCommonHelper.ThrowWhenMacroStabilityKernelOutputNull(macroStabilityOutput);
 
-        macroStabilityCommonHelper.PerformStabilityCalculation(macroStabilityKernelDataInput.Input, macroStabilityOutput,
-                                                               fileNameForCalculation, stabilityCalculator, out messages);
+        macroStabilityCommonHelper.PerformStabilityCalculation(macroStabilityKernelDataInput.DamKernelInput, 
+                                                               macroStabilityKernelDataInput.MStabParameters, 
+                                                               macroStabilityKernelDataInput.WaterNet, 
+                                                               macroStabilityKernelDataInput.XCoordinateLowestUpliftFactorPoint, 
+                                                               macroStabilityOutput, fileNameForCalculation, stabilityCalculator, 
+                                                               out messages);
         string fileName = Path.GetFileNameWithoutExtension(fileNameForCalculation);
         foreach (LogMessage logMessage in messages)
         {