Index: Riskeer/GrassCoverErosionInwards/src/Riskeer.GrassCoverErosionInwards.Data/GrassCoverErosionInwardsCalculation.cs
===================================================================
diff -u -r5294cbf38ddf4c3fdd7c37b78f1ab4fa89ad9b86 -r2844878b34cba10c97aeac1693c25c042a7aa8c1
--- Riskeer/GrassCoverErosionInwards/src/Riskeer.GrassCoverErosionInwards.Data/GrassCoverErosionInwardsCalculation.cs	(.../GrassCoverErosionInwardsCalculation.cs)	(revision 5294cbf38ddf4c3fdd7c37b78f1ab4fa89ad9b86)
+++ Riskeer/GrassCoverErosionInwards/src/Riskeer.GrassCoverErosionInwards.Data/GrassCoverErosionInwardsCalculation.cs	(.../GrassCoverErosionInwardsCalculation.cs)	(revision 2844878b34cba10c97aeac1693c25c042a7aa8c1)
@@ -19,7 +19,6 @@
 // Stichting Deltares and remain full property of Stichting Deltares at all times.
 // All rights reserved.
 
-using System;
 using Core.Common.Base;
 using Riskeer.Common.Data;
 using Riskeer.Common.Data.Calculation;
@@ -35,13 +34,10 @@
         /// <summary>
         /// Creates a new instance of <see cref="GrassCoverErosionInwardsCalculation"/>.
         /// </summary>
-        /// <param name="norm">The norm to use in the calculation input.</param>
-        /// <exception cref="ArgumentOutOfRangeException">Thrown when <paramref name="norm"/>
-        /// is not in the interval {0.0, 0.1] or is <see cref="double.NaN"/>.</exception>
-        public GrassCoverErosionInwardsCalculation(double norm)
+        public GrassCoverErosionInwardsCalculation()
         {
             Name = RiskeerCommonDataResources.Calculation_DefaultName;
-            InputParameters = new GrassCoverErosionInwardsInput(norm);
+            InputParameters = new GrassCoverErosionInwardsInput();
             Comments = new Comment();
         }
 
Index: Riskeer/GrassCoverErosionInwards/src/Riskeer.GrassCoverErosionInwards.Data/GrassCoverErosionInwardsCalculationScenario.cs
===================================================================
diff -u -r5294cbf38ddf4c3fdd7c37b78f1ab4fa89ad9b86 -r2844878b34cba10c97aeac1693c25c042a7aa8c1
--- Riskeer/GrassCoverErosionInwards/src/Riskeer.GrassCoverErosionInwards.Data/GrassCoverErosionInwardsCalculationScenario.cs	(.../GrassCoverErosionInwardsCalculationScenario.cs)	(revision 5294cbf38ddf4c3fdd7c37b78f1ab4fa89ad9b86)
+++ Riskeer/GrassCoverErosionInwards/src/Riskeer.GrassCoverErosionInwards.Data/GrassCoverErosionInwardsCalculationScenario.cs	(.../GrassCoverErosionInwardsCalculationScenario.cs)	(revision 2844878b34cba10c97aeac1693c25c042a7aa8c1)
@@ -19,7 +19,6 @@
 // Stichting Deltares and remain full property of Stichting Deltares at all times.
 // All rights reserved.
 
-using System;
 using Core.Common.Base.Data;
 using Riskeer.Common.Data.Calculation;
 using Riskeer.Common.Data.Helpers;
@@ -36,11 +35,7 @@
         /// <summary>
         /// Creates a new instance of <see cref="GrassCoverErosionInwardsCalculationScenario"/>.
         /// </summary>
-        /// <param name="norm">The norm to use in the calculation input.</param>
-        /// <exception cref="ArgumentOutOfRangeException">Thrown when <paramref name="norm"/>
-        /// is not in the interval {0.0, 0.1] or is <see cref="double.NaN"/>.</exception>
-        public GrassCoverErosionInwardsCalculationScenario(double norm) 
-            : base(norm)
+        public GrassCoverErosionInwardsCalculationScenario()
         {
             IsRelevant = true;
             contribution = new RoundedDouble(CalculationScenarioHelper.ContributionNumberOfDecimalPlaces, 1);
Index: Riskeer/GrassCoverErosionInwards/src/Riskeer.GrassCoverErosionInwards.Data/GrassCoverErosionInwardsInput.cs
===================================================================
diff -u -rebfd500b10e6634a584b5dd904d445078769ae90 -r2844878b34cba10c97aeac1693c25c042a7aa8c1
--- Riskeer/GrassCoverErosionInwards/src/Riskeer.GrassCoverErosionInwards.Data/GrassCoverErosionInwardsInput.cs	(.../GrassCoverErosionInwardsInput.cs)	(revision ebfd500b10e6634a584b5dd904d445078769ae90)
+++ Riskeer/GrassCoverErosionInwards/src/Riskeer.GrassCoverErosionInwards.Data/GrassCoverErosionInwardsInput.cs	(.../GrassCoverErosionInwardsInput.cs)	(revision 2844878b34cba10c97aeac1693c25c042a7aa8c1)
@@ -55,10 +55,7 @@
         /// <summary>
         /// Creates a new instance of <see cref="GrassCoverErosionInwardsInput"/>.
         /// </summary>
-        /// <param name="norm">The norm to use.</param>
-        /// <exception cref="ArgumentOutOfRangeException">Thrown when <paramref name="norm"/>
-        /// is not in the interval {0.0, 0.1] or is <see cref="double.NaN"/>.</exception>
-        public GrassCoverErosionInwardsInput(double norm)
+        public GrassCoverErosionInwardsInput()
         {
             orientation = new RoundedDouble(orientationNumberOfDecimals);
             dikeHeight = new RoundedDouble(2);
@@ -72,9 +69,6 @@
             };
             DikeHeightCalculationType = DikeHeightCalculationType.NoCalculation;
             OvertoppingRateCalculationType = OvertoppingRateCalculationType.NoCalculation;
-
-            DikeHeightTargetProbability = norm;
-            OvertoppingRateTargetProbability = norm;
         }
 
         /// <summary>
Index: Riskeer/GrassCoverErosionInwards/src/Riskeer.GrassCoverErosionInwards.Forms/GrassCoverErosionInwardsCalculationConfigurationHelper.cs
===================================================================
diff -u -r9112e9c014cded1efbcffbe95d260bcf7cf137fd -r2844878b34cba10c97aeac1693c25c042a7aa8c1
--- Riskeer/GrassCoverErosionInwards/src/Riskeer.GrassCoverErosionInwards.Forms/GrassCoverErosionInwardsCalculationConfigurationHelper.cs	(.../GrassCoverErosionInwardsCalculationConfigurationHelper.cs)	(revision 9112e9c014cded1efbcffbe95d260bcf7cf137fd)
+++ Riskeer/GrassCoverErosionInwards/src/Riskeer.GrassCoverErosionInwards.Forms/GrassCoverErosionInwardsCalculationConfigurationHelper.cs	(.../GrassCoverErosionInwardsCalculationConfigurationHelper.cs)	(revision 2844878b34cba10c97aeac1693c25c042a7aa8c1)
@@ -62,12 +62,14 @@
 
             foreach (DikeProfile profile in dikeProfiles)
             {
-                var calculation = new GrassCoverErosionInwardsCalculationScenario(failureMechanismContribution.Norm)
+                var calculation = new GrassCoverErosionInwardsCalculationScenario
                 {
                     Name = NamingHelper.GetUniqueName(calculationGroup.Children, profile.Name, c => c.Name),
                     InputParameters =
                     {
-                        DikeProfile = profile
+                        DikeProfile = profile,
+                        DikeHeightTargetProbability = failureMechanismContribution.Norm,
+                        OvertoppingRateTargetProbability = failureMechanismContribution.Norm
                     }
                 };
                 calculationGroup.Children.Add(calculation);
Index: Riskeer/GrassCoverErosionInwards/src/Riskeer.GrassCoverErosionInwards.IO/Configurations/GrassCoverErosionInwardsCalculationConfigurationImporter.cs
===================================================================
diff -u -r3a493bf57841b3010a54d8e32f0aecd8a293e332 -r2844878b34cba10c97aeac1693c25c042a7aa8c1
--- Riskeer/GrassCoverErosionInwards/src/Riskeer.GrassCoverErosionInwards.IO/Configurations/GrassCoverErosionInwardsCalculationConfigurationImporter.cs	(.../GrassCoverErosionInwardsCalculationConfigurationImporter.cs)	(revision 3a493bf57841b3010a54d8e32f0aecd8a293e332)
+++ Riskeer/GrassCoverErosionInwards/src/Riskeer.GrassCoverErosionInwards.IO/Configurations/GrassCoverErosionInwardsCalculationConfigurationImporter.cs	(.../GrassCoverErosionInwardsCalculationConfigurationImporter.cs)	(revision 2844878b34cba10c97aeac1693c25c042a7aa8c1)
@@ -91,9 +91,14 @@
 
         protected override ICalculation ParseReadCalculation(GrassCoverErosionInwardsCalculationConfiguration readCalculation)
         {
-            var calculation = new GrassCoverErosionInwardsCalculationScenario(failureMechanismContribution.Norm)
+            var calculation = new GrassCoverErosionInwardsCalculationScenario
             {
-                Name = readCalculation.Name
+                Name = readCalculation.Name,
+                InputParameters =
+                {
+                    DikeHeightTargetProbability = failureMechanismContribution.Norm,
+                    OvertoppingRateTargetProbability = failureMechanismContribution.Norm
+                }
             };
 
             if (TrySetCriticalFlowRate(readCalculation, calculation)
Index: Riskeer/GrassCoverErosionInwards/src/Riskeer.GrassCoverErosionInwards.Plugin/GrassCoverErosionInwardsPlugin.cs
===================================================================
diff -u -r72ecf8d28448698d9077f780cd0afc6b07101b54 -r2844878b34cba10c97aeac1693c25c042a7aa8c1
--- Riskeer/GrassCoverErosionInwards/src/Riskeer.GrassCoverErosionInwards.Plugin/GrassCoverErosionInwardsPlugin.cs	(.../GrassCoverErosionInwardsPlugin.cs)	(revision 72ecf8d28448698d9077f780cd0afc6b07101b54)
+++ Riskeer/GrassCoverErosionInwards/src/Riskeer.GrassCoverErosionInwards.Plugin/GrassCoverErosionInwardsPlugin.cs	(.../GrassCoverErosionInwardsPlugin.cs)	(revision 2844878b34cba10c97aeac1693c25c042a7aa8c1)
@@ -815,9 +815,16 @@
 
         private static void AddCalculation(GrassCoverErosionInwardsCalculationGroupContext context)
         {
-            var calculation = new GrassCoverErosionInwardsCalculationScenario(context.AssessmentSection.FailureMechanismContribution.Norm)
+            double norm = context.AssessmentSection.FailureMechanismContribution.Norm;
+            
+            var calculation = new GrassCoverErosionInwardsCalculationScenario
             {
-                Name = NamingHelper.GetUniqueName(context.WrappedData.Children, RiskeerCommonDataResources.Calculation_DefaultName, c => c.Name)
+                Name = NamingHelper.GetUniqueName(context.WrappedData.Children, RiskeerCommonDataResources.Calculation_DefaultName, c => c.Name),
+                InputParameters =
+                {
+                    DikeHeightTargetProbability = norm,
+                    OvertoppingRateTargetProbability = norm
+                }
             };
             context.WrappedData.Children.Add(calculation);
             context.WrappedData.NotifyObservers();
Index: Riskeer/Storage/src/Riskeer.Storage.Core/Read/GrassCoverErosionInwards/GrassCoverErosionInwardsCalculationEntityReadExtensions.cs
===================================================================
diff -u -rae63828db6c6e20bc476fe8adfef362e3966a5ad -r2844878b34cba10c97aeac1693c25c042a7aa8c1
--- Riskeer/Storage/src/Riskeer.Storage.Core/Read/GrassCoverErosionInwards/GrassCoverErosionInwardsCalculationEntityReadExtensions.cs	(.../GrassCoverErosionInwardsCalculationEntityReadExtensions.cs)	(revision ae63828db6c6e20bc476fe8adfef362e3966a5ad)
+++ Riskeer/Storage/src/Riskeer.Storage.Core/Read/GrassCoverErosionInwards/GrassCoverErosionInwardsCalculationEntityReadExtensions.cs	(.../GrassCoverErosionInwardsCalculationEntityReadExtensions.cs)	(revision 2844878b34cba10c97aeac1693c25c042a7aa8c1)
@@ -51,7 +51,7 @@
                 throw new ArgumentNullException(nameof(collector));
             }
 
-            var calculation = new GrassCoverErosionInwardsCalculationScenario(0.1)
+            var calculation = new GrassCoverErosionInwardsCalculationScenario
             {
                 Name = entity.Name,
                 Comments =