Index: DamEngine/trunk/src/Deltares.DamEngine.Interface/FillXmlOutputFromDam.cs
===================================================================
diff -u -r4540 -r5354
--- DamEngine/trunk/src/Deltares.DamEngine.Interface/FillXmlOutputFromDam.cs	(.../FillXmlOutputFromDam.cs)	(revision 4540)
+++ DamEngine/trunk/src/Deltares.DamEngine.Interface/FillXmlOutputFromDam.cs	(.../FillXmlOutputFromDam.cs)	(revision 5354)
@@ -323,52 +323,56 @@
 
         if (designResult.StabilityDesignResults != null)
         {
-            switch (designResult.StabilityDesignResults.StabilityModelType)
+            bool isBishop = designResult.StabilityDesignResults.StabilityModelType == MStabModelType.Bishop;
+            bool isUpliftVan = designResult.StabilityDesignResults.StabilityModelType == MStabModelType.UpliftVan;
+            if (designResult.StabilityDesignResults.StabilityModelType == MStabModelType.BishopUpliftVan)
             {
-                case MStabModelType.Bishop:
-                    desResult.StabilityDesignResults.SlipCircleDefinition = new SlidingCircleMinimumSafetyCurveType();
-                    var singleSlipCircleDefinition = (SlidingCircleMinimumSafetyCurveType) desResult.StabilityDesignResults.SlipCircleDefinition;
+                isBishop = designResult.StabilityDesignResults.PassiveCenterPoint == null;
+                isUpliftVan = designResult.StabilityDesignResults.PassiveCenterPoint != null;
+            }
 
-                    if (designResult.StabilityDesignResults.ActiveCenterPoint != null)
-                    {
-                        singleSlipCircleDefinition.Center = new Point2DType
-                        {
-                            X = designResult.StabilityDesignResults.ActiveCenterPoint.X,
-                            Z = designResult.StabilityDesignResults.ActiveCenterPoint.Z
-                        };
-                        singleSlipCircleDefinition.Radius = designResult.StabilityDesignResults.ActiveCenterPointRadius;
-                    }
+            if (isBishop)
+            {
+                desResult.StabilityDesignResults.SlipCircleDefinition = new SlidingCircleMinimumSafetyCurveType();
+                var singleSlipCircleDefinition = (SlidingCircleMinimumSafetyCurveType) desResult.StabilityDesignResults.SlipCircleDefinition;
 
-                    break;
-
-                case MStabModelType.UpliftVan:
-                    desResult.StabilityDesignResults.SlipCircleDefinition = new DualSlidingCircleMinimumSafetyCurveType();
-                    var dualSlipCircleDefinition = (DualSlidingCircleMinimumSafetyCurveType) desResult.StabilityDesignResults.SlipCircleDefinition;
-                    if (designResult.StabilityDesignResults.ActiveCenterPoint != null)
+                if (designResult.StabilityDesignResults.ActiveCenterPoint != null)
+                {
+                    singleSlipCircleDefinition.Center = new Point2DType
                     {
-                        dualSlipCircleDefinition.ActiveCircleCenter = new Point2DType
-                        {
-                            X = designResult.StabilityDesignResults.ActiveCenterPoint.X,
-                            Z = designResult.StabilityDesignResults.ActiveCenterPoint.Z
-                        };
-                        dualSlipCircleDefinition.ActiveCircleRadius = designResult.StabilityDesignResults.ActiveCenterPointRadius;
-                    }
+                        X = designResult.StabilityDesignResults.ActiveCenterPoint.X,
+                        Z = designResult.StabilityDesignResults.ActiveCenterPoint.Z
+                    };
+                    singleSlipCircleDefinition.Radius = designResult.StabilityDesignResults.ActiveCenterPointRadius;
+                }
+            }
 
-                    if (designResult.StabilityDesignResults.PassiveCenterPoint != null)
+            if (isUpliftVan)
+            {
+                desResult.StabilityDesignResults.SlipCircleDefinition = new DualSlidingCircleMinimumSafetyCurveType();
+                var dualSlipCircleDefinition = (DualSlidingCircleMinimumSafetyCurveType) desResult.StabilityDesignResults.SlipCircleDefinition;
+                if (designResult.StabilityDesignResults.ActiveCenterPoint != null)
+                {
+                    dualSlipCircleDefinition.ActiveCircleCenter = new Point2DType
                     {
-                        dualSlipCircleDefinition.PassiveCircleCenter = new Point2DType
-                        {
-                            X = designResult.StabilityDesignResults.PassiveCenterPoint.X,
-                            Z = designResult.StabilityDesignResults.PassiveCenterPoint.Z
-                        };
-                        dualSlipCircleDefinition.PassiveCircleRadius = designResult.StabilityDesignResults.PassiveCenterPointRadius;
-                    }
+                        X = designResult.StabilityDesignResults.ActiveCenterPoint.X,
+                        Z = designResult.StabilityDesignResults.ActiveCenterPoint.Z
+                    };
+                    dualSlipCircleDefinition.ActiveCircleRadius = designResult.StabilityDesignResults.ActiveCenterPointRadius;
+                }
 
-                    break;
+                if (designResult.StabilityDesignResults.PassiveCenterPoint != null)
+                {
+                    dualSlipCircleDefinition.PassiveCircleCenter = new Point2DType
+                    {
+                        X = designResult.StabilityDesignResults.PassiveCenterPoint.X,
+                        Z = designResult.StabilityDesignResults.PassiveCenterPoint.Z
+                    };
+                    dualSlipCircleDefinition.PassiveCircleRadius = designResult.StabilityDesignResults.PassiveCenterPointRadius;
+                }
             }
 
-            if (designResult.StabilityDesignResults.StabilityModelType == MStabModelType.Bishop ||
-                designResult.StabilityDesignResults.StabilityModelType == MStabModelType.UpliftVan)
+            if (designResult.StabilityDesignResults.StabilityModelType is MStabModelType.Bishop or MStabModelType.UpliftVan or MStabModelType.BishopUpliftVan)
             {
                 if (designResult.StabilityDesignResults.ResultSlices != null &&
                     designResult.StabilityDesignResults.ResultSlices.Count > 0)