Index: Riskeer/StabilityStoneCover/src/Riskeer.StabilityStoneCover.Plugin/StabilityStoneCoverPlugin.cs
===================================================================
diff -u -r9650e7e51fb6bab7a5ea99487ccb143dd7bac8c1 -raaea9a6608ef667d6b4f6318ac33eebe3819ec5a
--- Riskeer/StabilityStoneCover/src/Riskeer.StabilityStoneCover.Plugin/StabilityStoneCoverPlugin.cs	(.../StabilityStoneCoverPlugin.cs)	(revision 9650e7e51fb6bab7a5ea99487ccb143dd7bac8c1)
+++ Riskeer/StabilityStoneCover/src/Riskeer.StabilityStoneCover.Plugin/StabilityStoneCoverPlugin.cs	(.../StabilityStoneCoverPlugin.cs)	(revision aaea9a6608ef667d6b4f6318ac33eebe3819ec5a)
@@ -1,4 +1,4 @@
-// Copyright (C) Stichting Deltares 2021. All rights reserved.
+// Copyright (C) Stichting Deltares 2021. All rights reserved.
 //
 // This file is part of Riskeer.
 //
@@ -43,6 +43,7 @@
 using Riskeer.Common.Forms.PresentationObjects;
 using Riskeer.Common.Forms.TreeNodeInfos;
 using Riskeer.Common.Forms.UpdateInfos;
+using Riskeer.Common.Forms.Views;
 using Riskeer.Common.Plugin;
 using Riskeer.Common.Service;
 using Riskeer.Common.Util.Helpers;
@@ -107,16 +108,16 @@
                 CloseForData = CloseFailurePathViewForData
             };
 
-            yield return new RiskeerViewInfo<FailureMechanismSectionResultContext<StabilityStoneCoverFailureMechanismSectionResultOld>,
-                IObservableEnumerable<StabilityStoneCoverFailureMechanismSectionResultOld>,
-                StabilityStoneCoverResultViewOld>(() => Gui)
+            yield return new RiskeerViewInfo<StabilityStoneCoverFailureMechanismSectionResultContext,
+                IObservableEnumerable<NonAdoptableWithProfileProbabilityFailureMechanismSectionResult>,
+                NonAdoptableWithProfileProbabilityFailureMechanismResultView<StabilityStoneCoverFailureMechanism>>(() => Gui)
             {
                 GetViewName = (view, context) => RiskeerCommonFormsResources.FailureMechanism_AssessmentResult_DisplayName,
                 CloseForData = CloseFailureMechanismResultViewForData,
                 GetViewData = context => context.WrappedData,
-                CreateInstance = context => new StabilityStoneCoverResultViewOld(
-                    context.WrappedData,
-                    (StabilityStoneCoverFailureMechanism) context.FailureMechanism)
+                CreateInstance = context => new NonAdoptableWithProfileProbabilityFailureMechanismResultView<StabilityStoneCoverFailureMechanism>(
+                    context.WrappedData, (StabilityStoneCoverFailureMechanism) context.FailureMechanism, context.AssessmentSection,
+                    fm => fm.GeneralInput.N, fm => fm.GeneralInput.ApplyLengthEffectInSection)
             };
 
             yield return new RiskeerViewInfo<StabilityStoneCoverWaveConditionsInputContext,
@@ -273,15 +274,14 @@
 
         private static bool CloseFailurePathViewForData(StabilityStoneCoverFailurePathView view, object dataToCloseFor)
         {
-            var assessmentSection = dataToCloseFor as IAssessmentSection;
             var failureMechanism = dataToCloseFor as StabilityStoneCoverFailureMechanism;
 
-            return assessmentSection != null
+            return dataToCloseFor is IAssessmentSection assessmentSection
                        ? ReferenceEquals(view.AssessmentSection, assessmentSection)
                        : ReferenceEquals(view.FailureMechanism, failureMechanism);
         }
 
-        private static bool CloseFailureMechanismResultViewForData(StabilityStoneCoverResultViewOld view, object dataToCloseFor)
+        private static bool CloseFailureMechanismResultViewForData(NonAdoptableWithProfileProbabilityFailureMechanismResultView<StabilityStoneCoverFailureMechanism> view, object dataToCloseFor)
         {
             var failureMechanism = dataToCloseFor as StabilityStoneCoverFailureMechanism;
 
@@ -297,7 +297,7 @@
                 failureMechanism = failurePathContext.WrappedData;
             }
 
-            return failureMechanism != null && ReferenceEquals(view.FailureMechanism.SectionResultsOld, failureMechanism.SectionResultsOld);
+            return failureMechanism != null && ReferenceEquals(view.FailureMechanism.SectionResults, failureMechanism.SectionResults);
         }
 
         #endregion
@@ -454,17 +454,14 @@
 
             foreach (ICalculationBase item in nodeData.WrappedData.Children)
             {
-                var calculation = item as StabilityStoneCoverWaveConditionsCalculation;
-                var group = item as CalculationGroup;
-
-                if (calculation != null)
+                if (item is StabilityStoneCoverWaveConditionsCalculation calculation)
                 {
                     childNodeObjects.Add(new StabilityStoneCoverWaveConditionsCalculationContext(calculation,
                                                                                                  nodeData.WrappedData,
                                                                                                  nodeData.FailureMechanism,
                                                                                                  nodeData.AssessmentSection));
                 }
-                else if (group != null)
+                else if (item is CalculationGroup group)
                 {
                     childNodeObjects.Add(new StabilityStoneCoverWaveConditionsCalculationGroupContext(group,
                                                                                                       nodeData.WrappedData,
Index: Riskeer/StabilityStoneCover/test/Riskeer.StabilityStoneCover.Plugin.Test/StabilityStoneCoverPluginTest.cs
===================================================================
diff -u -r9650e7e51fb6bab7a5ea99487ccb143dd7bac8c1 -raaea9a6608ef667d6b4f6318ac33eebe3819ec5a
--- Riskeer/StabilityStoneCover/test/Riskeer.StabilityStoneCover.Plugin.Test/StabilityStoneCoverPluginTest.cs	(.../StabilityStoneCoverPluginTest.cs)	(revision 9650e7e51fb6bab7a5ea99487ccb143dd7bac8c1)
+++ Riskeer/StabilityStoneCover/test/Riskeer.StabilityStoneCover.Plugin.Test/StabilityStoneCoverPluginTest.cs	(.../StabilityStoneCoverPluginTest.cs)	(revision aaea9a6608ef667d6b4f6318ac33eebe3819ec5a)
@@ -30,7 +30,8 @@
 using Core.Gui.TestUtil;
 using NUnit.Framework;
 using Rhino.Mocks;
-using Riskeer.Common.Forms.PresentationObjects;
+using Riskeer.Common.Data.FailureMechanism;
+using Riskeer.Common.Forms.Views;
 using Riskeer.Revetment.Forms.Views;
 using Riskeer.StabilityStoneCover.Data;
 using Riskeer.StabilityStoneCover.Forms.PresentationObjects;
@@ -108,9 +109,9 @@
 
                 PluginTestHelper.AssertViewInfoDefined(
                     viewInfos,
-                    typeof(FailureMechanismSectionResultContext<StabilityStoneCoverFailureMechanismSectionResultOld>),
-                    typeof(IObservableEnumerable<StabilityStoneCoverFailureMechanismSectionResultOld>),
-                    typeof(StabilityStoneCoverResultViewOld));
+                    typeof(StabilityStoneCoverFailureMechanismSectionResultContext),
+                    typeof(IObservableEnumerable<NonAdoptableWithProfileProbabilityFailureMechanismSectionResult>),
+                    typeof(NonAdoptableWithProfileProbabilityFailureMechanismResultView<StabilityStoneCoverFailureMechanism>));
 
                 PluginTestHelper.AssertViewInfoDefined(
                     viewInfos,
Index: Riskeer/StabilityStoneCover/test/Riskeer.StabilityStoneCover.Plugin.Test/ViewInfos/StabilityStoneCoverResultViewInfoTest.cs
===================================================================
diff -u -r72082701dd10333c0dd79313fca6191306d134a7 -raaea9a6608ef667d6b4f6318ac33eebe3819ec5a
--- Riskeer/StabilityStoneCover/test/Riskeer.StabilityStoneCover.Plugin.Test/ViewInfos/StabilityStoneCoverResultViewInfoTest.cs	(.../StabilityStoneCoverResultViewInfoTest.cs)	(revision 72082701dd10333c0dd79313fca6191306d134a7)
+++ Riskeer/StabilityStoneCover/test/Riskeer.StabilityStoneCover.Plugin.Test/ViewInfos/StabilityStoneCoverResultViewInfoTest.cs	(.../StabilityStoneCoverResultViewInfoTest.cs)	(revision aaea9a6608ef667d6b4f6318ac33eebe3819ec5a)
@@ -27,10 +27,9 @@
 using Rhino.Mocks;
 using Riskeer.Common.Data.AssessmentSection;
 using Riskeer.Common.Data.FailureMechanism;
-using Riskeer.Common.Forms.PresentationObjects;
+using Riskeer.Common.Forms.Views;
 using Riskeer.StabilityStoneCover.Data;
 using Riskeer.StabilityStoneCover.Forms.PresentationObjects;
-using Riskeer.StabilityStoneCover.Forms.Views;
 
 namespace Riskeer.StabilityStoneCover.Plugin.Test.ViewInfos
 {
@@ -46,7 +45,7 @@
         {
             mocks = new MockRepository();
             plugin = new StabilityStoneCoverPlugin();
-            info = plugin.GetViewInfos().First(tni => tni.ViewType == typeof(StabilityStoneCoverResultViewOld));
+            info = plugin.GetViewInfos().First(tni => tni.ViewType == typeof(NonAdoptableWithProfileProbabilityFailureMechanismResultView<StabilityStoneCoverFailureMechanism>));
         }
 
         [TearDown]
@@ -59,8 +58,8 @@
         public void Initialized_Always_ExpectedPropertiesSet()
         {
             // Assert
-            Assert.AreEqual(typeof(FailureMechanismSectionResultContext<StabilityStoneCoverFailureMechanismSectionResultOld>), info.DataType);
-            Assert.AreEqual(typeof(IObservableEnumerable<StabilityStoneCoverFailureMechanismSectionResultOld>), info.ViewDataType);
+            Assert.AreEqual(typeof(StabilityStoneCoverFailureMechanismSectionResultContext), info.DataType);
+            Assert.AreEqual(typeof(IObservableEnumerable<NonAdoptableWithProfileProbabilityFailureMechanismSectionResult>), info.ViewDataType);
         }
 
         [Test]
@@ -71,14 +70,14 @@
             mocks.ReplayAll();
 
             var failureMechanism = new StabilityStoneCoverFailureMechanism();
-            var context = new ProbabilityFailureMechanismSectionResultContext<StabilityStoneCoverFailureMechanismSectionResultOld>(
-                failureMechanism.SectionResultsOld, failureMechanism, assessmentSection);
+            var context = new StabilityStoneCoverFailureMechanismSectionResultContext(
+                failureMechanism.SectionResults, failureMechanism, assessmentSection);
 
             // Call
             object viewData = info.GetViewData(context);
 
             // Assert
-            Assert.AreSame(failureMechanism.SectionResultsOld, viewData);
+            Assert.AreSame(failureMechanism.SectionResults, viewData);
             mocks.VerifyAll();
         }
 
@@ -103,15 +102,17 @@
 
             mocks.ReplayAll();
 
-            using (var view = new StabilityStoneCoverResultViewOld(failureMechanism.SectionResultsOld, failureMechanism))
+            using (var view = new NonAdoptableWithProfileProbabilityFailureMechanismResultView<StabilityStoneCoverFailureMechanism>(
+                failureMechanism.SectionResults, failureMechanism, assessmentSection, fm => double.NaN, fm => false))
             {
                 // Call
                 bool closeForData = info.CloseForData(view, assessmentSection);
 
                 // Assert
                 Assert.IsFalse(closeForData);
-                mocks.VerifyAll();
             }
+
+            mocks.VerifyAll();
         }
 
         [Test]
@@ -129,15 +130,17 @@
 
             mocks.ReplayAll();
 
-            using (var view = new StabilityStoneCoverResultViewOld(failureMechanism.SectionResultsOld, failureMechanism))
+            using (var view = new NonAdoptableWithProfileProbabilityFailureMechanismResultView<StabilityStoneCoverFailureMechanism>(
+                failureMechanism.SectionResults, failureMechanism, assessmentSection, fm => double.NaN, fm => false))
             {
                 // Call
                 bool closeForData = info.CloseForData(view, assessmentSection);
 
                 // Assert
                 Assert.IsFalse(closeForData);
-                mocks.VerifyAll();
             }
+
+            mocks.VerifyAll();
         }
 
         [Test]
@@ -154,49 +157,63 @@
 
             mocks.ReplayAll();
 
-            using (var view = new StabilityStoneCoverResultViewOld(failureMechanism.SectionResultsOld, failureMechanism))
+            using (var view = new NonAdoptableWithProfileProbabilityFailureMechanismResultView<StabilityStoneCoverFailureMechanism>(
+                failureMechanism.SectionResults, failureMechanism, assessmentSection, fm => double.NaN, fm => false))
             {
                 // Call
                 bool closeForData = info.CloseForData(view, assessmentSection);
 
                 // Assert
                 Assert.IsTrue(closeForData);
-                mocks.VerifyAll();
             }
+
+            mocks.VerifyAll();
         }
 
         [Test]
         public void CloseForData_ViewCorrespondingToRemovedFailureMechanism_ReturnsTrue()
         {
             // Setup
+            var assessmentSection = mocks.Stub<IAssessmentSection>();
+            mocks.ReplayAll();
+
             var failureMechanism = new StabilityStoneCoverFailureMechanism();
 
-            using (var view = new StabilityStoneCoverResultViewOld(failureMechanism.SectionResultsOld, failureMechanism))
+            using (var view = new NonAdoptableWithProfileProbabilityFailureMechanismResultView<StabilityStoneCoverFailureMechanism>(
+                failureMechanism.SectionResults, failureMechanism, assessmentSection, fm => double.NaN, fm => false))
             {
                 // Call
                 bool closeForData = info.CloseForData(view, failureMechanism);
 
                 // Assert
                 Assert.IsTrue(closeForData);
             }
+
+            mocks.VerifyAll();
         }
 
         [Test]
         public void CloseForData_ViewNotCorrespondingToRemovedFailureMechanism_ReturnsFalse()
         {
             // Setup
+            var assessmentSection = mocks.Stub<IAssessmentSection>();
+            mocks.ReplayAll();
+
             var failureMechanism = new StabilityStoneCoverFailureMechanism();
 
-            using (var view = new StabilityStoneCoverResultViewOld(failureMechanism.SectionResultsOld, failureMechanism))
+            using (var view = new NonAdoptableWithProfileProbabilityFailureMechanismResultView<StabilityStoneCoverFailureMechanism>(
+                failureMechanism.SectionResults, failureMechanism, assessmentSection, fm => double.NaN, fm => false))
             {
                 // Call
                 bool closeForData = info.CloseForData(view, new StabilityStoneCoverFailureMechanism());
 
                 // Assert
                 Assert.IsFalse(closeForData);
             }
+
+            mocks.VerifyAll();
         }
-        
+
         [Test]
         public void CloseForData_ViewCorrespondingToRemovedFailurePathContext_ReturnsTrue()
         {
@@ -207,15 +224,17 @@
             var failureMechanism = new StabilityStoneCoverFailureMechanism();
             var context = new StabilityStoneCoverFailurePathContext(failureMechanism, assessmentSection);
 
-            using (var view = new StabilityStoneCoverResultViewOld(failureMechanism.SectionResultsOld, failureMechanism))
+            using (var view = new NonAdoptableWithProfileProbabilityFailureMechanismResultView<StabilityStoneCoverFailureMechanism>(
+                failureMechanism.SectionResults, failureMechanism, assessmentSection, fm => double.NaN, fm => false))
             {
                 // Call
                 bool closeForData = info.CloseForData(view, context);
 
                 // Assert
                 Assert.IsTrue(closeForData);
-                mocks.VerifyAll();
             }
+
+            mocks.VerifyAll();
         }
 
         [Test]
@@ -228,15 +247,17 @@
             var context = new StabilityStoneCoverFailurePathContext(new StabilityStoneCoverFailureMechanism(), assessmentSection);
             var failureMechanism = new StabilityStoneCoverFailureMechanism();
 
-            using (var view = new StabilityStoneCoverResultViewOld(failureMechanism.SectionResultsOld, failureMechanism))
+            using (var view = new NonAdoptableWithProfileProbabilityFailureMechanismResultView<StabilityStoneCoverFailureMechanism>(
+                failureMechanism.SectionResults, failureMechanism, assessmentSection, fm => double.NaN, fm => false))
             {
                 // Call
                 bool closeForData = info.CloseForData(view, context);
 
                 // Assert
                 Assert.IsFalse(closeForData);
-                mocks.VerifyAll();
             }
+
+            mocks.VerifyAll();
         }
 
         [Test]
@@ -247,16 +268,14 @@
             mocks.ReplayAll();
 
             var failureMechanism = new StabilityStoneCoverFailureMechanism();
-            var context = new ProbabilityFailureMechanismSectionResultContext<StabilityStoneCoverFailureMechanismSectionResultOld>(
-                failureMechanism.SectionResultsOld,
-                failureMechanism,
-                assessmentSection);
+            var context = new StabilityStoneCoverFailureMechanismSectionResultContext(
+                failureMechanism.SectionResults, failureMechanism, assessmentSection);
 
             // Call
             IView view = info.CreateInstance(context);
 
             // Assert
-            Assert.IsInstanceOf<StabilityStoneCoverResultViewOld>(view);
+            Assert.IsInstanceOf<NonAdoptableWithProfileProbabilityFailureMechanismResultView<StabilityStoneCoverFailureMechanism>>(view);
             mocks.VerifyAll();
         }
     }