Index: Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Data/GrassCoverErosionInwardsOutput.cs
===================================================================
diff -u -r8cb270db5fbcb82f19d6f3a390f083e9e0516d8c -rb63c17a1ec42d980aad2b4e19664fd5414fb995e
--- Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Data/GrassCoverErosionInwardsOutput.cs	(.../GrassCoverErosionInwardsOutput.cs)	(revision 8cb270db5fbcb82f19d6f3a390f083e9e0516d8c)
+++ Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Data/GrassCoverErosionInwardsOutput.cs	(.../GrassCoverErosionInwardsOutput.cs)	(revision b63c17a1ec42d980aad2b4e19664fd5414fb995e)
@@ -27,7 +27,7 @@
 namespace Ringtoets.GrassCoverErosionInwards.Data
 {
     /// <summary>
-    /// The result of a Grass Cover Erosion Inwards assessment.
+    /// The result of a grass cover erosion inwards assessment.
     /// </summary>
     public class GrassCoverErosionInwardsOutput : Observable, ICalculationOutput
     {
Index: Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Data/SubCalculationAssessmentOutput.cs
===================================================================
diff -u -r8cb270db5fbcb82f19d6f3a390f083e9e0516d8c -rb63c17a1ec42d980aad2b4e19664fd5414fb995e
--- Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Data/SubCalculationAssessmentOutput.cs	(.../SubCalculationAssessmentOutput.cs)	(revision 8cb270db5fbcb82f19d6f3a390f083e9e0516d8c)
+++ Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Data/SubCalculationAssessmentOutput.cs	(.../SubCalculationAssessmentOutput.cs)	(revision b63c17a1ec42d980aad2b4e19664fd5414fb995e)
@@ -27,7 +27,7 @@
 namespace Ringtoets.GrassCoverErosionInwards.Data
 {
     /// <summary>
-    /// This class contains the result of a dike height calculation.
+    /// This class contains the result of a grass cover erosion inwards sub calculation.
     /// </summary>
     public class SubCalculationAssessmentOutput
     {
Index: Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Forms/PresentationObjects/GrassCoverErosionInwardsScenariosContext.cs
===================================================================
diff -u -rb2b9fdf365e70928a05c57966eeed30d9050e528 -rb63c17a1ec42d980aad2b4e19664fd5414fb995e
--- Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Forms/PresentationObjects/GrassCoverErosionInwardsScenariosContext.cs	(.../GrassCoverErosionInwardsScenariosContext.cs)	(revision b2b9fdf365e70928a05c57966eeed30d9050e528)
+++ Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Forms/PresentationObjects/GrassCoverErosionInwardsScenariosContext.cs	(.../GrassCoverErosionInwardsScenariosContext.cs)	(revision b63c17a1ec42d980aad2b4e19664fd5414fb995e)
@@ -27,7 +27,7 @@
 namespace Ringtoets.GrassCoverErosionInwards.Forms.PresentationObjects
 {
     /// <summary>
-    /// Presentation object for configuration of scenarios for the Grass Cover Erosion Inwards
+    /// Presentation object for configuration of scenarios for the grass cover erosion inwards
     /// failure mechanism.
     /// </summary>
     public class GrassCoverErosionInwardsScenariosContext : WrappedObjectContextBase<CalculationGroup>
Index: Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Service/GrassCoverErosionInwardsCalculationService.cs
===================================================================
diff -u -r8cb270db5fbcb82f19d6f3a390f083e9e0516d8c -rb63c17a1ec42d980aad2b4e19664fd5414fb995e
--- Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Service/GrassCoverErosionInwardsCalculationService.cs	(.../GrassCoverErosionInwardsCalculationService.cs)	(revision 8cb270db5fbcb82f19d6f3a390f083e9e0516d8c)
+++ Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Service/GrassCoverErosionInwardsCalculationService.cs	(.../GrassCoverErosionInwardsCalculationService.cs)	(revision b63c17a1ec42d980aad2b4e19664fd5414fb995e)
@@ -139,26 +139,40 @@
             {
                 throw new ArgumentNullException(nameof(calculation));
             }
+
             if (assessmentSection == null)
             {
                 throw new ArgumentNullException(nameof(assessmentSection));
             }
+
             if (generalInput == null)
             {
                 throw new ArgumentNullException(nameof(generalInput));
             }
+
+            var totalSteps = 1;
+            string calculationName = calculation.Name;
             string hlcdDirectory = Path.GetDirectoryName(hydraulicBoundaryDatabaseFilePath);
+            SubCalculationAssessmentOutput dikeHeightOutput = null;
+            SubCalculationAssessmentOutput overtoppingRateOutput = null;
+
             bool calculateDikeHeight = calculation.InputParameters.DikeHeightCalculationType != DikeHeightCalculationType.NoCalculation;
-            int totalSteps = calculateDikeHeight ? 2 : 1;
-            string calculationName = calculation.Name;
+            if (calculateDikeHeight)
+            {
+                totalSteps++;
+            }
 
-            NotifyProgress(Resources.GrassCoverErosionInwardsCalculationService_Calculate_Executing_overtopping_calculation, 1, totalSteps);
+            bool calculateOvertoppingRate = calculation.InputParameters.OvertoppingRateCalculationType != OvertoppingRateCalculationType.NoCalculation;
+            if (calculateOvertoppingRate)
+            {
+                totalSteps++;
+            }
 
+            NotifyProgress(Resources.GrassCoverErosionInwardsCalculationService_Calculate_Executing_overtopping_calculation, 1, totalSteps);
             CalculationServiceHelper.LogCalculationBeginTime(calculationName);
 
             overtoppingCalculator = HydraRingCalculatorFactory.Instance.CreateOvertoppingCalculator(hlcdDirectory);
             OvertoppingCalculationInput overtoppingCalculationInput = CreateOvertoppingInput(calculation, generalInput, hydraulicBoundaryDatabaseFilePath);
-            SubCalculationAssessmentOutput dikeHeight = null;
 
             try
             {
@@ -190,7 +204,7 @@
 
                     if (dikeHeightCalculated)
                     {
-                        dikeHeight = CreateDikeHeightAssessmentOutput(calculationName, dikeHeightCalculationInput.Beta, norm);
+                        dikeHeightOutput = CreateDikeHeightAssessmentOutput(calculationName, dikeHeightCalculationInput.Beta, norm);
                     }
                 }
 
@@ -202,7 +216,7 @@
                         failureMechanismContribution,
                         generalInput.N,
                         overtoppingCalculator.ExceedanceProbabilityBeta),
-                    dikeHeight,
+                    dikeHeightOutput,
                     null);
             }
             finally
@@ -221,8 +235,8 @@
         /// <exception cref="ArgumentOutOfRangeException">Thrown when <paramref name="targetProbability"/> 
         /// or the calculated probability falls outside the [0.0, 1.0] range and is not <see cref="double.NaN"/>.</exception>
         private SubCalculationAssessmentOutput CreateDikeHeightAssessmentOutput(string calculationName,
-                                                                            double targetReliability,
-                                                                            double targetProbability)
+                                                                                double targetReliability,
+                                                                                double targetProbability)
         {
             double dikeHeight = dikeHeightCalculator.DikeHeight;
             double reliability = dikeHeightCalculator.ReliabilityIndex;
@@ -236,8 +250,8 @@
             }
 
             return new SubCalculationAssessmentOutput(dikeHeight, targetProbability,
-                                                  targetReliability, probability, reliability,
-                                                  converged);
+                                                      targetReliability, probability, reliability,
+                                                      converged);
         }
 
         private static double GetProbabilityToUse(double assessmentSectionNorm, GeneralGrassCoverErosionInwardsInput generalInput,
Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Calculator/OvertoppingCalculator.cs
===================================================================
diff -u -r28409889b18ffaecebe9737e65410a30be956206 -rb63c17a1ec42d980aad2b4e19664fd5414fb995e
--- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Calculator/OvertoppingCalculator.cs	(.../OvertoppingCalculator.cs)	(revision 28409889b18ffaecebe9737e65410a30be956206)
+++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Calculator/OvertoppingCalculator.cs	(.../OvertoppingCalculator.cs)	(revision b63c17a1ec42d980aad2b4e19664fd5414fb995e)
@@ -29,7 +29,7 @@
 {
     /// <summary>
     /// Calculator for calculating probability of failure by overtopping or overflow and the
-    /// associated wave height. This is used in a Grass Cover Erosion Inwards assessment.
+    /// associated wave height. This is used in a grass cover erosion inwards assessment.
     /// </summary>
     internal class OvertoppingCalculator : HydraRingCalculatorBase, IOvertoppingCalculator
     {