Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/CsvImporters/CsvImporterScenarios.cs
===================================================================
diff -u -r2579 -r2602
--- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/CsvImporters/CsvImporterScenarios.cs	(.../CsvImporterScenarios.cs)	(revision 2579)
+++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/CsvImporters/CsvImporterScenarios.cs	(.../CsvImporterScenarios.cs)	(revision 2602)
@@ -70,9 +70,9 @@
 
             public double? UpliftCriterionPiping { get; set; } //optional
             public double? UpliftCriterionStability { get; set; } //optional
-            public double? SafetyFactorPiping { get; set; } //optional
-            public double? SafetyFactorStabilityInnerSlope { get; set; } //optional
-            public double? SafetyFactorStabilityOuterSlope { get; set; } //optional
+            public double? RequiredSafetyFactorPiping { get; set; } //optional
+            public double? RequiredSafetyFactorStabilityInnerSlope { get; set; } //optional
+            public double? RequiredSafetyFactorStabilityOuterSlope { get; set; } //optional
         }
 
         private void CheckColumn(int index, string fileName, string fieldName)
@@ -173,17 +173,17 @@
                             if (colIndexSafetyFactorPiping > -1)
                             {
                                 colIndex = colIndexSafetyFactorPiping;
-                                scenario.SafetyFactorPiping = Convert.ToDouble(csv[colIndex]);
+                                scenario.RequiredSafetyFactorPiping = Convert.ToDouble(csv[colIndex]);
                             }
                             if (colIndexSafetyFactorStabilityInnerSlope > -1)
                             {
                                 colIndex = colIndexSafetyFactorStabilityInnerSlope;
-                                scenario.SafetyFactorStabilityInnerSlope = Convert.ToDouble(csv[colIndex]);
+                                scenario.RequiredSafetyFactorStabilityInnerSlope = Convert.ToDouble(csv[colIndex]);
                             }
                             if (colIndexSafetyFactorStabilityOuterSlope > -1)
                             {
                                 colIndex = colIndexSafetyFactorStabilityOuterSlope;
-                                scenario.SafetyFactorStabilityOuterSlope = Convert.ToDouble(csv[colIndex]);
+                                scenario.RequiredSafetyFactorStabilityOuterSlope = Convert.ToDouble(csv[colIndex]);
                             }
                             if (colIndexUpliftCriterionPiping > -1)
                             {
Index: DamClients/DamUI/trunk/src/Dam/Tests/CsvImporterTestsNew.cs
===================================================================
diff -u -r2548 -r2602
--- DamClients/DamUI/trunk/src/Dam/Tests/CsvImporterTestsNew.cs	(.../CsvImporterTestsNew.cs)	(revision 2548)
+++ DamClients/DamUI/trunk/src/Dam/Tests/CsvImporterTestsNew.cs	(.../CsvImporterTestsNew.cs)	(revision 2602)
@@ -818,9 +818,9 @@
             Assert.AreEqual(0.0, scenarioRecords[0].RiverLevel);
             Assert.AreEqual(0.680, scenarioRecords[0].RiverLevelLow);
             Assert.AreEqual(21.110, scenarioRecords[0].DikeTableHeight);
-            Assert.AreEqual(31.600, scenarioRecords[0].SafetyFactorPiping);
-            Assert.AreEqual(0.0, scenarioRecords[0].SafetyFactorStabilityInnerSlope);
-            Assert.AreEqual(1.300, scenarioRecords[0].SafetyFactorStabilityOuterSlope);
+            Assert.AreEqual(31.600, scenarioRecords[0].RequiredSafetyFactorPiping);
+            Assert.AreEqual(0.0, scenarioRecords[0].RequiredSafetyFactorStabilityInnerSlope);
+            Assert.AreEqual(1.300, scenarioRecords[0].RequiredSafetyFactorStabilityOuterSlope);
             Assert.AreEqual(1.3, scenarioRecords[0].UpliftCriterionPiping);
             Assert.AreEqual(0.0, scenarioRecords[0].UpliftCriterionStability);
 
@@ -829,9 +829,9 @@
             Assert.AreEqual(0.0, scenarioRecords[1].RiverLevel);
             Assert.AreEqual(1.680, scenarioRecords[1].RiverLevelLow);
             Assert.AreEqual(22.110, scenarioRecords[1].DikeTableHeight);
-            Assert.AreEqual(32.600, scenarioRecords[1].SafetyFactorPiping);
-            Assert.AreEqual(1.0, scenarioRecords[1].SafetyFactorStabilityInnerSlope);
-            Assert.AreEqual(1.400, scenarioRecords[1].SafetyFactorStabilityOuterSlope);
+            Assert.AreEqual(32.600, scenarioRecords[1].RequiredSafetyFactorPiping);
+            Assert.AreEqual(1.0, scenarioRecords[1].RequiredSafetyFactorStabilityInnerSlope);
+            Assert.AreEqual(1.400, scenarioRecords[1].RequiredSafetyFactorStabilityOuterSlope);
             Assert.AreEqual(1.3, scenarioRecords[1].UpliftCriterionPiping);
             Assert.AreEqual(0.0, scenarioRecords[1].UpliftCriterionStability);
         }
@@ -851,9 +851,9 @@
             Assert.AreEqual(0.0, scenarioRecords[0].RiverLevel);
             Assert.AreEqual(0.680, scenarioRecords[0].RiverLevelLow);
             Assert.AreEqual(21.110, scenarioRecords[0].DikeTableHeight);
-            Assert.AreEqual(31.600, scenarioRecords[0].SafetyFactorPiping);
-            Assert.AreEqual(0.0, scenarioRecords[0].SafetyFactorStabilityInnerSlope);
-            Assert.AreEqual(1.300, scenarioRecords[0].SafetyFactorStabilityOuterSlope);
+            Assert.AreEqual(31.600, scenarioRecords[0].RequiredSafetyFactorPiping);
+            Assert.AreEqual(0.0, scenarioRecords[0].RequiredSafetyFactorStabilityInnerSlope);
+            Assert.AreEqual(1.300, scenarioRecords[0].RequiredSafetyFactorStabilityOuterSlope);
             Assert.AreEqual(1.3, scenarioRecords[0].UpliftCriterionPiping);
             Assert.AreEqual(0.0, scenarioRecords[0].UpliftCriterionStability);
             Assert.AreEqual(1.1, scenarioRecords[0].PlLineOffsetBelowDikeTopAtRiver);
@@ -872,9 +872,9 @@
             Assert.AreEqual(0.0, scenarioRecords[1].RiverLevel);
             Assert.AreEqual(1.680, scenarioRecords[1].RiverLevelLow);
             Assert.AreEqual(22.110, scenarioRecords[1].DikeTableHeight);
-            Assert.AreEqual(32.600, scenarioRecords[1].SafetyFactorPiping);
-            Assert.AreEqual(1.0, scenarioRecords[1].SafetyFactorStabilityInnerSlope);
-            Assert.AreEqual(1.400, scenarioRecords[1].SafetyFactorStabilityOuterSlope);
+            Assert.AreEqual(32.600, scenarioRecords[1].RequiredSafetyFactorPiping);
+            Assert.AreEqual(1.0, scenarioRecords[1].RequiredSafetyFactorStabilityInnerSlope);
+            Assert.AreEqual(1.400, scenarioRecords[1].RequiredSafetyFactorStabilityOuterSlope);
             Assert.AreEqual(1.3, scenarioRecords[1].UpliftCriterionPiping);
             Assert.AreEqual(0.0, scenarioRecords[1].UpliftCriterionStability);
             Assert.AreEqual(0.1, scenarioRecords[1].PlLineOffsetBelowDikeTopAtRiver);
Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/IO/CombineImportedData.cs
===================================================================
diff -u -r2579 -r2602
--- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/IO/CombineImportedData.cs	(.../CombineImportedData.cs)	(revision 2579)
+++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/IO/CombineImportedData.cs	(.../CombineImportedData.cs)	(revision 2602)
@@ -648,40 +648,25 @@
                     }
                     else
                     {
+                        var locationRecord = LocationRecords.FirstOrDefault(l => l.LocationId == scenarioRecord.LocationId);
+                        // set values in scenario (1 from scenariorecord, 2 from locationrecord, 3 default)
                         var modelFactors = new ModelFactors();
-                        if (scenarioRecord.SafetyFactorStabilityInnerSlope.HasValue)
-                        {
-                            modelFactors.RequiredSafetyFactorStabilityInnerSlope =
-                                scenarioRecord.SafetyFactorStabilityInnerSlope.Value;
-                        }
-                        if (scenarioRecord.SafetyFactorStabilityOuterSlope.HasValue)
-                        {
-                            modelFactors.RequiredSafetyFactorStabilityOuterSlope =
-                                scenarioRecord.SafetyFactorStabilityOuterSlope.Value;
-                        }
-                        if (scenarioRecord.SafetyFactorPiping.HasValue)
-                        {
-                            modelFactors.RequiredSafetyFactorPiping =
-                                scenarioRecord.SafetyFactorPiping.Value;
-                        }
-                        if (scenarioRecord.UpliftCriterionStability.HasValue)
-                        {
-                            modelFactors.UpliftCriterionStability =
-                                scenarioRecord.UpliftCriterionStability.Value;
-                        }
-                        if (scenarioRecord.UpliftCriterionPiping.HasValue)
-                        {
-                            modelFactors.UpliftCriterionPiping =
-                                scenarioRecord.UpliftCriterionPiping.Value;
-                        }
+                        modelFactors.RequiredSafetyFactorStabilityInnerSlope = scenarioRecord.RequiredSafetyFactorStabilityInnerSlope ??
+                            (locationRecord.RequiredSafetyFactorStabilityInnerSlope ?? modelFactors.RequiredSafetyFactorStabilityInnerSlope);
+                        modelFactors.RequiredSafetyFactorStabilityOuterSlope = scenarioRecord.RequiredSafetyFactorStabilityOuterSlope ??
+                            (locationRecord.RequiredSafetyFactorStabilityOuterSlope ?? modelFactors.RequiredSafetyFactorStabilityOuterSlope);
+                        modelFactors.RequiredSafetyFactorPiping = scenarioRecord.RequiredSafetyFactorPiping ??
+                            (locationRecord.RequiredSafetyFactorPiping ?? modelFactors.RequiredSafetyFactorPiping);
+                        modelFactors.UpliftCriterionStability = scenarioRecord.UpliftCriterionStability ??
+                            (locationRecord.UpliftCriterionStability ?? modelFactors.UpliftCriterionStability);
+                        modelFactors.UpliftCriterionPiping = scenarioRecord.UpliftCriterionPiping ??
+                            (locationRecord.UpliftCriterionPiping ?? modelFactors.UpliftCriterionPiping);
                         var scenario = new Scenario
                         {
                             Location = dikeLocation, 
                             LocationScenarioID = scenarioRecord.LocationScenarioId, 
                             ModelFactors = modelFactors
                         };
-                        var locationRecord = LocationRecords.FirstOrDefault(l => l.LocationId == scenarioRecord.LocationId);
-                        // set values in scenario (1 from scenariorecord, 2 from locationrecord, 3 default)
                         scenario.PlLineOffsetBelowDikeToeAtPolder = scenarioRecord.PlLineOffsetBelowDikeToeAtPolder ?? 
                             (locationRecord.PlLineOffsetBelowDikeToeAtPolder ?? scenario.PlLineOffsetBelowDikeToeAtPolder);
                         scenario.PlLineOffsetBelowDikeTopAtPolder = scenarioRecord.PlLineOffsetBelowDikeTopAtPolder ?? 
@@ -690,7 +675,7 @@
                             (locationRecord.PlLineOffsetBelowDikeTopAtRiver ?? scenario.PlLineOffsetBelowDikeTopAtRiver);
                         scenario.PlLineOffsetBelowShoulderBaseInside = scenarioRecord.PlLineOffsetBelowShoulderBaseInside ??
                             (locationRecord.PlLineOffsetBelowShoulderBaseInside ?? scenario.PlLineOffsetBelowShoulderBaseInside);
-                        // set values in scenario (1 from scenariorecord, 2 from locationrecord)
+                        // set values in scenario (1 from scenariorecord, 2 from locationrecord, 3 stays null)
                         scenario.PlLineOffsetBelowDikeCrestMiddle = scenarioRecord.PlLineOffsetBelowDikeCrestMiddle ?? 
                             locationRecord.PlLineOffsetBelowDikeCrestMiddle;
                         scenario.PlLineOffsetFactorBelowShoulderCrest = scenarioRecord.PlLineOffsetFactorBelowShoulderCrest ?? 
Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Translations.xml
===================================================================
diff -u -r2566 -r2602
--- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Translations.xml	(.../Translations.xml)	(revision 2566)
+++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Translations.xml	(.../Translations.xml)	(revision 2602)
@@ -301,12 +301,12 @@
   <Translation ID="RiverLevelLow" en-US="River level low" nl-NL="Lage buitenwaterstand" />
   <Translation ID="RiverLevelLowDescription" en-US="Water level in river (summer)" nl-NL="Lage buitenwaterstand, bijvoorbeeld LWS" />
   <Translation ID="MinimalCircleDepth" en-US="Minimum circle depth" nl-NL="Minimale cirkel diepte" />
-  <Translation ID="RequiredSafetyFactorStabilityInnerSlope" en-US="Safety factor inner slope" nl-NL="Veiligheidsfactor binnenwaartse stabiliteit" />
-  <Translation ID="RequiredSafetyFactorStabilityInnerSlopeDescription" en-US="Required safety factor for inner slope stability" nl-NL="Vereiste veiligheidsfactor binnenwaartse stabiliteit" />
-  <Translation ID="RequiredSafetyFactorStabilityOuterSlope" en-US="Safety factor outer slope" nl-NL="Veiligheidsfactor buitenwaartse stabiliteit" />
-  <Translation ID="RequiredSafetyFactorStabilityOuterSlopeDescription" en-US="Required safety factor for outer slope stability" nl-NL="Vereiste veiligheidsfactor buitenwaartse stabiliteit" />
-  <Translation ID="RequiredSafetyFactorPiping" en-US="Safety factor piping" nl-NL="Veiligheidsfactor piping" />
-  <Translation ID="RequiredSafetyFactorPipingDescription" en-US="Required safety factor for piping" nl-NL="Vereiste veiligheidsfactor piping" />
+  <Translation ID="RequiredRequiredSafetyFactorStabilityInnerSlope" en-US="Safety factor inner slope" nl-NL="Veiligheidsfactor binnenwaartse stabiliteit" />
+  <Translation ID="RequiredRequiredSafetyFactorStabilityInnerSlopeDescription" en-US="Required safety factor for inner slope stability" nl-NL="Vereiste veiligheidsfactor binnenwaartse stabiliteit" />
+  <Translation ID="RequiredRequiredSafetyFactorStabilityOuterSlope" en-US="Safety factor outer slope" nl-NL="Veiligheidsfactor buitenwaartse stabiliteit" />
+  <Translation ID="RequiredRequiredSafetyFactorStabilityOuterSlopeDescription" en-US="Required safety factor for outer slope stability" nl-NL="Vereiste veiligheidsfactor buitenwaartse stabiliteit" />
+  <Translation ID="RequiredRequiredSafetyFactorPiping" en-US="Safety factor piping" nl-NL="Veiligheidsfactor piping" />
+  <Translation ID="RequiredRequiredSafetyFactorPipingDescription" en-US="Required safety factor for piping" nl-NL="Vereiste veiligheidsfactor piping" />
   <Translation ID="RedesignDikeHeight" en-US="Redesign dike height" nl-NL="Dijkhoogte aanpassen bij ontwerpen" />
   <Translation ID="RedesignDikeShoulder" en-US="Redesign dike shoulder" nl-NL="Berm aanpassen bij ontwerpen" />
   <Translation ID="DikeTableHeight" en-US="Dike table height" nl-NL="DTH" />
@@ -524,7 +524,7 @@
   <Translation ID="NewDepthDitchDescription" en-US="Value for the new depth (ref. Polder level) of ditch bottom" nl-NL="Waarde voor de diepte (tov Polderpeil) van de bodem van de nieuwe sloot" />
   <Translation ID="NoUpliftCriterionForStability" en-US="No uplift criterion for Stability defined in location {0} scenario {1}" nl-NL="Geen opdrijfcriterium voor stablititeit gedfinieerd in locatie {0} scenario {1}" />
   <Translation ID="NoUpliftCriterionForPiping" en-US="No uplift criterion for Piping defined in location {0} scenario {1}" nl-NL="Geen opdrijfcriterium voor piping gedefinieerd in locatie {0} scenario {1}" />
-  <Translation ID="NoRequiredSafetyFactorPiping" en-US="No required safety factor for Piping defined in location {0} scenario {1}" nl-NL="Geen vereiste veiligheidsfactor voor piping gedfinieerd in locatie {0} scenario {1}" />
+  <Translation ID="NoRequiredRequiredSafetyFactorPiping" en-US="No required safety factor for Piping defined in location {0} scenario {1}" nl-NL="Geen vereiste veiligheidsfactor voor piping gedfinieerd in locatie {0} scenario {1}" />
   <Translation ID="ErrorReadingCsvColumnNames" en-US="Error reading CSV column headers; check for duplicate column names ('{0}' exception in {1})" nl-NL="Fout bij het lezen van de CSV kolom namen; controleer op dubbele namen ('{0}' exception in {1})" />
   <Translation ID="MainItems" en-US="Main items" nl-NL="Hoofd gegevens" />
   <Translation ID="LocationHasNoSegment" en-US="The location has no segment." nl-NL="De locatie heeft geen segment." />