Index: Riskeer/GrassCoverErosionOutwards/src/Riskeer.GrassCoverErosionOutwards.Service/GrassCoverErosionOutwardsWaveConditionsCalculationService.cs
===================================================================
diff -u -r87bd836d55d336e37e3d80f9a1521feb83ddc475 -r001129417fc6986284e5ea075d39983e70d250f6
--- Riskeer/GrassCoverErosionOutwards/src/Riskeer.GrassCoverErosionOutwards.Service/GrassCoverErosionOutwardsWaveConditionsCalculationService.cs	(.../GrassCoverErosionOutwardsWaveConditionsCalculationService.cs)	(revision 87bd836d55d336e37e3d80f9a1521feb83ddc475)
+++ Riskeer/GrassCoverErosionOutwards/src/Riskeer.GrassCoverErosionOutwards.Service/GrassCoverErosionOutwardsWaveConditionsCalculationService.cs	(.../GrassCoverErosionOutwardsWaveConditionsCalculationService.cs)	(revision 001129417fc6986284e5ea075d39983e70d250f6)
@@ -108,11 +108,10 @@
 
             CalculationServiceHelper.LogCalculationBegin();
 
-            RoundedDouble assessmentLevel = failureMechanism.GetAssessmentLevel(assessmentSection,
-                                                                                calculationInput.HydraulicBoundaryLocation,
-                                                                                calculationInput.CategoryType);
-            double norm = failureMechanism.GetNorm(assessmentSection, calculation.InputParameters.CategoryType);
+            RoundedDouble assessmentLevel = WaveConditionsInputHelper.GetAssessmentLevel(calculationInput, assessmentSection);
 
+            double targetProbability = WaveConditionsInputHelper.GetTargetProbability(calculationInput, assessmentSection);
+
             HydraulicBoundaryDatabase hydraulicBoundaryDatabase = assessmentSection.HydraulicBoundaryDatabase;
 
             DetermineTotalWaterLevelCalculations(calculationInput, assessmentLevel);
@@ -123,7 +122,7 @@
                 if (ShouldCalculateWaveRunUp(calculationType))
                 {
                     CurrentCalculationType = Resources.GrassCoverErosionOutwardsWaveConditions_WaveRunUp_DisplayName;
-                    waveRunUpOutput = CalculateWaveRunUp(calculation, failureMechanism, hydraulicBoundaryDatabase, assessmentLevel, norm);
+                    waveRunUpOutput = CalculateWaveRunUp(calculation, failureMechanism, hydraulicBoundaryDatabase, assessmentLevel, targetProbability);
                 }
 
                 if (Canceled)
@@ -135,14 +134,14 @@
                 if (ShouldCalculateWaveImpact(calculationType))
                 {
                     CurrentCalculationType = Resources.GrassCoverErosionOutwardsWaveConditions_WaveImpact_DisplayName;
-                    waveImpactOutput = CalculateWaveImpact(calculation, failureMechanism, hydraulicBoundaryDatabase, assessmentLevel, norm);
+                    waveImpactOutput = CalculateWaveImpact(calculation, failureMechanism, hydraulicBoundaryDatabase, assessmentLevel, targetProbability);
                 }
 
                 IEnumerable<WaveConditionsOutput> tailorMadeWaveImpactOutput = null;
                 if (ShouldCalculateTailorMadeWaveImpact(calculationType))
                 {
                     CurrentCalculationType = Resources.GrassCoverErosionOutwardsWaveConditions_TailorMadeWaveImpact_DisplayName;
-                    tailorMadeWaveImpactOutput = CalculateTailorMadeWaveImpact(calculation, failureMechanism, hydraulicBoundaryDatabase, assessmentLevel, norm);
+                    tailorMadeWaveImpactOutput = CalculateTailorMadeWaveImpact(calculation, failureMechanism, hydraulicBoundaryDatabase, assessmentLevel, targetProbability);
                 }
 
                 if (!Canceled)
Index: Riskeer/StabilityStoneCover/src/Riskeer.StabilityStoneCover.Service/StabilityStoneCoverWaveConditionsCalculationService.cs
===================================================================
diff -u -r2ef21b0f4d85a5c9689720d539254a1d5c907be7 -r001129417fc6986284e5ea075d39983e70d250f6
--- Riskeer/StabilityStoneCover/src/Riskeer.StabilityStoneCover.Service/StabilityStoneCoverWaveConditionsCalculationService.cs	(.../StabilityStoneCoverWaveConditionsCalculationService.cs)	(revision 2ef21b0f4d85a5c9689720d539254a1d5c907be7)
+++ Riskeer/StabilityStoneCover/src/Riskeer.StabilityStoneCover.Service/StabilityStoneCoverWaveConditionsCalculationService.cs	(.../StabilityStoneCoverWaveConditionsCalculationService.cs)	(revision 001129417fc6986284e5ea075d39983e70d250f6)
@@ -97,10 +97,9 @@
 
             CalculationServiceHelper.LogCalculationBegin();
 
-            double norm = assessmentSection.GetNorm(calculationInput.CategoryType);
+            double targetProbability = WaveConditionsInputHelper.GetTargetProbability(calculationInput, assessmentSection);
 
-            RoundedDouble assessmentLevel = assessmentSection.GetAssessmentLevel(calculationInput.HydraulicBoundaryLocation,
-                                                                                 calculationInput.CategoryType);
+            RoundedDouble assessmentLevel = WaveConditionsInputHelper.GetAssessmentLevel(calculationInput, assessmentSection);
 
             int waterLevelCount = calculationInput.GetWaterLevels(assessmentLevel).Count();
             TotalWaterLevelCalculations = calculationType == StabilityStoneCoverWaveConditionsCalculationType.Both
@@ -115,7 +114,7 @@
                 {
                     CurrentCalculationType = Resources.StabilityStoneCoverWaveConditions_Blocks_DisplayName;
                     blocksOutputs = CalculateBlocks(calculation, assessmentSection, assessmentLevel,
-                                                    generalWaveConditionsInput.GeneralBlocksWaveConditionsInput, norm);
+                                                    generalWaveConditionsInput.GeneralBlocksWaveConditionsInput, targetProbability);
                 }
 
                 if (Canceled)
@@ -129,7 +128,7 @@
                 {
                     CurrentCalculationType = Resources.StabilityStoneCoverWaveConditions_Columns_DisplayName;
                     columnsOutputs = CalculateColumns(calculation, assessmentSection, assessmentLevel,
-                                                      generalWaveConditionsInput.GeneralColumnsWaveConditionsInput, norm);
+                                                      generalWaveConditionsInput.GeneralColumnsWaveConditionsInput, targetProbability);
                 }
 
                 if (!Canceled)
Index: Riskeer/WaveImpactAsphaltCover/src/Riskeer.WaveImpactAsphaltCover.Service/WaveImpactAsphaltCoverWaveConditionsCalculationService.cs
===================================================================
diff -u -r4f4daebe59ab925c98cef039101ec70544530bbe -r001129417fc6986284e5ea075d39983e70d250f6
--- Riskeer/WaveImpactAsphaltCover/src/Riskeer.WaveImpactAsphaltCover.Service/WaveImpactAsphaltCoverWaveConditionsCalculationService.cs	(.../WaveImpactAsphaltCoverWaveConditionsCalculationService.cs)	(revision 4f4daebe59ab925c98cef039101ec70544530bbe)
+++ Riskeer/WaveImpactAsphaltCover/src/Riskeer.WaveImpactAsphaltCover.Service/WaveImpactAsphaltCoverWaveConditionsCalculationService.cs	(.../WaveImpactAsphaltCoverWaveConditionsCalculationService.cs)	(revision 001129417fc6986284e5ea075d39983e70d250f6)
@@ -88,18 +88,18 @@
             RoundedDouble b = generalWaveConditionsInput.B;
             RoundedDouble c = generalWaveConditionsInput.C;
 
-            double norm = assessmentSection.GetNorm(calculation.InputParameters.CategoryType);
-            RoundedDouble assessmentLevel = assessmentSection.GetAssessmentLevel(calculation.InputParameters.HydraulicBoundaryLocation,
-                                                                                 calculation.InputParameters.CategoryType);
+            double targetProbability = WaveConditionsInputHelper.GetTargetProbability(calculation.InputParameters, assessmentSection);
 
+            RoundedDouble assessmentLevel = WaveConditionsInputHelper.GetAssessmentLevel(calculation.InputParameters, assessmentSection);
+
             CurrentCalculationType = Resources.WaveImpactAsphaltCover_DisplayName;
             TotalWaterLevelCalculations = calculation.InputParameters.GetWaterLevels(assessmentLevel).Count();
 
             try
             {
                 IEnumerable<WaveConditionsOutput> outputs = CalculateWaveConditions(calculation.InputParameters,
                                                                                     assessmentLevel,
-                                                                                    a, b, c, norm,
+                                                                                    a, b, c, targetProbability,
                                                                                     assessmentSection.HydraulicBoundaryDatabase);
 
                 if (!Canceled)