diff --git a/ApplicationCode/ReservoirDataModel/RigTofAccumulatedPhaseFractionsCalculator.cpp b/ApplicationCode/ReservoirDataModel/RigTofAccumulatedPhaseFractionsCalculator.cpp
index 0ec72f807d..6e3e181543 100644
--- a/ApplicationCode/ReservoirDataModel/RigTofAccumulatedPhaseFractionsCalculator.cpp
+++ b/ApplicationCode/ReservoirDataModel/RigTofAccumulatedPhaseFractionsCalculator.cpp
@@ -18,16 +18,17 @@
 
 #include "RigTofAccumulatedPhaseFractionsCalculator.h"
 
+#include "RigCaseCellResultsData.h"
 #include "RigEclipseCaseData.h"
-#include "RimEclipseCase.h"
-#include "RimReservoirCellResultsStorage.h"
+#include "RigFlowDiagResultAddress.h"
+#include "RigFlowDiagResults.h"
 #include "RigResultAccessor.h"
 #include "RigResultAccessorFactory.h"
 #include "RigSingleWellResultsData.h"
-#include "RigFlowDiagResultAddress.h"
+
+#include "RimEclipseResultCase.h"
 #include "RimFlowDiagSolution.h"
-#include "RigFlowDiagResults.h"
-#include "RigCaseCellResultsData.h"
+#include "RimReservoirCellResultsStorage.h"
 
 #include <map>
 
@@ -36,13 +37,15 @@
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-RigTofAccumulatedPhaseFractionsCalculator::RigTofAccumulatedPhaseFractionsCalculator(RimEclipseCase* caseToApply, 
+RigTofAccumulatedPhaseFractionsCalculator::RigTofAccumulatedPhaseFractionsCalculator(RimEclipseResultCase* caseToApply, 
                                                                                      QString wellname, 
                                                                                      size_t timestep)
     :m_case(caseToApply),
     m_wellName(wellname),
     m_timeStep(timestep)
 {
+    m_flowDiagSolution = caseToApply->defaultFlowDiagSolution();
+
     computeTOFaccumulations();
 }
 
@@ -80,23 +83,16 @@ void RigTofAccumulatedPhaseFractionsCalculator::computeTOFaccumulations()
                                                                                                                            m_wellName.toStdString()),
                                                                                                   m_timeStep);
 
-
-    std::vector<double> accumulatedPhaseFractionSwat;
-    std::vector<double> accumulatedPhaseFractionSoil;
-    std::vector<double> accumulatedPhaseFractionSgas;
-    std::vector<double> tofInIncreasingOrder;
-
-
     sortTofAndCalculateAccPhaseFraction(tofData, 
                                         fractionData, 
                                         porvResults, 
                                         swatResults, 
                                         soilResults, 
                                         sgasResults, 
-                                        accumulatedPhaseFractionSwat, 
-                                        accumulatedPhaseFractionSoil, 
-                                        accumulatedPhaseFractionSgas, 
-                                        tofInIncreasingOrder);
+                                        m_accumulatedPhaseFractionSwat, 
+                                        m_accumulatedPhaseFractionSoil, 
+                                        m_accumulatedPhaseFractionSgas, 
+                                        m_tofInIncreasingOrder);
 
 
 
diff --git a/ApplicationCode/ReservoirDataModel/RigTofAccumulatedPhaseFractionsCalculator.h b/ApplicationCode/ReservoirDataModel/RigTofAccumulatedPhaseFractionsCalculator.h
index f47087bda6..3c77fe0243 100644
--- a/ApplicationCode/ReservoirDataModel/RigTofAccumulatedPhaseFractionsCalculator.h
+++ b/ApplicationCode/ReservoirDataModel/RigTofAccumulatedPhaseFractionsCalculator.h
@@ -28,7 +28,7 @@
 #include <array>
 #include "RimFlowDiagSolution.h"
 
-class RimEclipseCase;
+class RimEclipseResultCase;
 
 //==================================================================================================
 /// 
@@ -38,7 +38,7 @@ class RigTofAccumulatedPhaseFractionsCalculator
 {
 
 public:
-    explicit RigTofAccumulatedPhaseFractionsCalculator(RimEclipseCase* caseToApply,
+    explicit RigTofAccumulatedPhaseFractionsCalculator(RimEclipseResultCase* caseToApply,
                                                        QString wellname, 
                                                        size_t timestep);
 
@@ -63,7 +63,7 @@ private:
 
 
 private:
-    RimEclipseCase*                             m_case;
+    RimEclipseResultCase*                       m_case;
     QString                                     m_wellName;
     size_t                                      m_timeStep;