Index: dam engine/trunk/src/Deltares.DamEngine.Interface.Tests/FillDamFromXmlInputTests.cs
===================================================================
diff -u -r843 -r851
--- dam engine/trunk/src/Deltares.DamEngine.Interface.Tests/FillDamFromXmlInputTests.cs	(.../FillDamFromXmlInputTests.cs)	(revision 843)
+++ dam engine/trunk/src/Deltares.DamEngine.Interface.Tests/FillDamFromXmlInputTests.cs	(.../FillDamFromXmlInputTests.cs)	(revision 851)
@@ -283,6 +283,14 @@
                 location.SlopeAdaptionStartCotangent = 10.0 * i + 0.13;
                 location.SlopeAdaptionEndCotangent = 10.0 * i + 0.14;
                 location.SlopeAdaptionStepCotangent = 10.0 * i + 0.15;
+                location.UseNewDikeTopWidth = true;
+                location.UseNewDikeSlopeInside = true;
+                location.UseNewDikeSlopeOutside = true;
+                location.UseNewShoulderTopSlope = true;
+                location.UseNewShoulderBaseSlope = true;
+                location.UseNewMaxHeightShoulderAsFraction = true;
+                location.UseNewMinDistanceDikeToeStartDitch = true;
+                location.UseNewDitchDefinition = true;
                 location.NewDikeTopWidth = 10.0 * i + 0.16;
                 location.NewDikeSlopeInside = 10.0 * i + 0.17;
                 location.NewDikeSlopeOutside = 10.0 * i + 0.18;
Index: dam engine/trunk/src/Deltares.DamEngine.Interface/FillXmlInputFromDam.cs
===================================================================
diff -u -r843 -r851
--- dam engine/trunk/src/Deltares.DamEngine.Interface/FillXmlInputFromDam.cs	(.../FillXmlInputFromDam.cs)	(revision 843)
+++ dam engine/trunk/src/Deltares.DamEngine.Interface/FillXmlInputFromDam.cs	(.../FillXmlInputFromDam.cs)	(revision 851)
@@ -326,27 +326,26 @@
                     designOptions.SlopeAdaptionStartCotangent = location.SlopeAdaptionStartCotangent;
                     designOptions.SlopeAdaptionEndCotangent = location.SlopeAdaptionEndCotangent;
                     designOptions.SlopeAdaptionStepCotangent = location.SlopeAdaptionStepCotangent;
-                    designOptions.NewDikeTopWidthSpecified = true;
+                    designOptions.NewDikeTopWidthSpecified = location.UseNewDikeTopWidth;
                     designOptions.NewDikeTopWidth = location.NewDikeTopWidth;
-                    designOptions.NewDikeSlopeInsideSpecified = true;
+                    designOptions.NewDikeSlopeInsideSpecified = location.UseNewDikeSlopeInside;
                     designOptions.NewDikeSlopeInside = location.NewDikeSlopeInside;
-                    designOptions.NewDikeSlopeInsideSpecified = true;
+                    designOptions.NewDikeSlopeOutsideSpecified = location.UseNewDikeSlopeOutside;
                     designOptions.NewDikeSlopeOutside = location.NewDikeSlopeOutside;
-                    designOptions.NewDikeSlopeOutsideSpecified = true;
+                    designOptions.NewShoulderTopSlopeSpecified = location.UseNewShoulderTopSlope;
                     designOptions.NewShoulderTopSlope = location.NewShoulderTopSlope;
-                    designOptions.NewShoulderTopSlopeSpecified = true;
+                    designOptions.NewShoulderBaseSlopeSpecified = location.UseNewShoulderBaseSlope;
                     designOptions.NewShoulderBaseSlope = location.NewShoulderBaseSlope;
-                    designOptions.NewShoulderBaseSlopeSpecified = true;
+                    designOptions.NewMaxHeightShoulderAsFractionSpecified = location.UseNewMaxHeightShoulderAsFraction;
                     designOptions.NewMaxHeightShoulderAsFraction = location.NewMaxHeightShoulderAsFraction;
-                    designOptions.NewMaxHeightShoulderAsFractionSpecified = true;
+                    designOptions.NewMinDistanceDikeToeStartDitchSpecified = location.UseNewMinDistanceDikeToeStartDitch;
                     designOptions.NewMinDistanceDikeToeStartDitch = location.NewMinDistanceDikeToeStartDitch;
-                    designOptions.NewMinDistanceDikeToeStartDitchSpecified = true;
                     designOptions.UseNewDitchDefinition = location.UseNewDitchDefinition;
-                    designOptions.NewWidthDitchBottomSpecified = true;
+                    designOptions.NewWidthDitchBottomSpecified = location.UseNewDitchDefinition;
                     designOptions.NewWidthDitchBottom = location.NewWidthDitchBottom;
-                    designOptions.NewSlopeAngleDitchSpecified = true;
+                    designOptions.NewSlopeAngleDitchSpecified = location.UseNewDitchDefinition;
                     designOptions.NewSlopeAngleDitch = location.NewSlopeAngleDitch;
-                    designOptions.NewDepthDitchSpecified = true;
+                    designOptions.NewDepthDitchSpecified = location.UseNewDitchDefinition;
                     designOptions.NewDepthDitch = location.NewDepthDitch;
                     designOptions.StabilityDesignMethod = ConversionHelper.ConvertToInputStabilityDesignMethod(location.StabilityDesignMethod);
                     inputLocation.DesignOptions = designOptions;
Index: dam engine/trunk/src/Deltares.DamEngine.Interface/FillDamFromXmlInput.cs
===================================================================
diff -u -r849 -r851
--- dam engine/trunk/src/Deltares.DamEngine.Interface/FillDamFromXmlInput.cs	(.../FillDamFromXmlInput.cs)	(revision 849)
+++ dam engine/trunk/src/Deltares.DamEngine.Interface/FillDamFromXmlInput.cs	(.../FillDamFromXmlInput.cs)	(revision 851)
@@ -364,12 +364,19 @@
                     location.SlopeAdaptionStartCotangent = designOptions.SlopeAdaptionStartCotangent;
                     location.SlopeAdaptionEndCotangent = designOptions.SlopeAdaptionEndCotangent;
                     location.SlopeAdaptionStepCotangent = designOptions.SlopeAdaptionStepCotangent;
+                    location.UseNewDikeTopWidth = designOptions.NewDikeTopWidthSpecified;
                     if (designOptions.NewDikeTopWidthSpecified) location.NewDikeTopWidth = designOptions.NewDikeTopWidth;
+                    location.UseNewDikeSlopeInside = designOptions.NewDikeSlopeInsideSpecified;
                     if (designOptions.NewDikeSlopeInsideSpecified) location.NewDikeSlopeInside = designOptions.NewDikeSlopeInside;
+                    location.UseNewDikeSlopeOutside = designOptions.NewDikeSlopeOutsideSpecified;
                     if (designOptions.NewDikeSlopeOutsideSpecified) location.NewDikeSlopeOutside = designOptions.NewDikeSlopeOutside;
+                    location.UseNewShoulderTopSlope = designOptions.NewShoulderTopSlopeSpecified;
                     if (designOptions.NewShoulderTopSlopeSpecified) location.NewShoulderTopSlope = designOptions.NewShoulderTopSlope;
+                    location.UseNewShoulderBaseSlope = designOptions.NewShoulderBaseSlopeSpecified;
                     if (designOptions.NewShoulderBaseSlopeSpecified) location.NewShoulderBaseSlope = designOptions.NewShoulderBaseSlope;
+                    location.UseNewMaxHeightShoulderAsFraction = designOptions.NewMaxHeightShoulderAsFractionSpecified;
                     if (designOptions.NewMaxHeightShoulderAsFractionSpecified) location.NewMaxHeightShoulderAsFraction = designOptions.NewMaxHeightShoulderAsFraction;
+                    location.UseNewMinDistanceDikeToeStartDitch = designOptions.NewMinDistanceDikeToeStartDitchSpecified;
                     if (designOptions.NewMinDistanceDikeToeStartDitchSpecified) location.NewMinDistanceDikeToeStartDitch = designOptions.NewMinDistanceDikeToeStartDitch;
                     location.UseNewDitchDefinition = designOptions.UseNewDitchDefinition;
                     if (designOptions.NewWidthDitchBottomSpecified) location.NewWidthDitchBottom = designOptions.NewWidthDitchBottom;