diff --git a/appl/lecture/msm/buckleyleverett/buckleyleverettproblem.hh b/appl/lecture/msm/buckleyleverett/buckleyleverettproblem.hh
index 42d7dd162e0bc1cc64d2cb381fc0dc7501cb95a2..12c06bff33b35766532e90dd43ba1656b51265d8 100644
--- a/appl/lecture/msm/buckleyleverett/buckleyleverettproblem.hh
+++ b/appl/lecture/msm/buckleyleverett/buckleyleverettproblem.hh
@@ -259,8 +259,10 @@ public:
 
     BoundaryConditions::Flags bctypeSat(const GlobalPosition& globalPos, const Intersection& intersection) const
     {
-        if (globalPos[0]> (upperRight_[0] - eps_) || globalPos[0] < eps_)
+        if (globalPos[0] < eps_)
             return Dumux::BoundaryConditions::dirichlet;
+        else if (globalPos[0] > upperRight_[0] - eps_)
+            return Dumux::BoundaryConditions::outflow;
         else
             return Dumux::BoundaryConditions::neumann;
     }
@@ -281,7 +283,7 @@ public:
         return 0.2;
     }
 
-    std::vector<Scalar> neumannPress(const GlobalPosition& globalPos, const Intersection& intersection) const
+    std::vector<Scalar> neumann(const GlobalPosition& globalPos, const Intersection& intersection) const
     {
         std::vector<Scalar> neumannFlux(2, 0.0);
         if (globalPos[0]> upperRight_[0] - eps_)
@@ -294,12 +296,6 @@ public:
         return neumannFlux;
     }
 
-    Scalar neumannSat(const GlobalPosition& globalPos, const Intersection& intersection, Scalar factor) const
-    {
-        if (globalPos[0] > upperRight_[0] - eps_)
-        return factor;
-        return 0;
-    }
     Scalar initSat(const GlobalPosition& globalPos, const Element& element) const
     {
         if (globalPos[0] < eps_)
diff --git a/appl/lecture/msm/mcwhorter/mcwhorterproblem.hh b/appl/lecture/msm/mcwhorter/mcwhorterproblem.hh
index 02d421e6941f29f680172053c93d4e84c554074c..e07bd42b428c5aefa29286f399b6315316c6c339 100644
--- a/appl/lecture/msm/mcwhorter/mcwhorterproblem.hh
+++ b/appl/lecture/msm/mcwhorter/mcwhorterproblem.hh
@@ -29,7 +29,7 @@
 #include <dumux/decoupled/2p/transport/fv/fvsaturation2p.hh>
 #include <dumux/decoupled/2p/transport/fv/capillarydiffusion.hh>
 #include <dumux/decoupled/2p/transport/fv/gravitypart.hh>
-
+#include<dumux/decoupled/2p/transport/fv/evalcflflux_coats.hh>
 
 #include "mcwhorter_spatialparams.hh"
 #include "mcwhorter_analytic.hh"
@@ -111,7 +111,8 @@ public:
 // Disable gravity
 SET_BOOL_PROP(McWhorterProblem, EnableGravity, false);
 
-SET_SCALAR_PROP(McWhorterProblem, CFLFactor, 0.1);
+SET_TYPE_PROP(McWhorterProblem, EvalCflFluxFunction, Dumux::EvalCflFluxCoats<TypeTag>);
+SET_SCALAR_PROP(McWhorterProblem, CFLFactor, 0.8);
 }
 
 //! \ingroup transportProblems
@@ -245,16 +246,11 @@ public:
         return 0.0;
     }
 
-    std::vector<Scalar> neumannPress(const GlobalPosition& globalPos, const Intersection& intersection) const
+    std::vector<Scalar> neumann(const GlobalPosition& globalPos, const Intersection& intersection) const
     {
         return std::vector<Scalar>(2,0.0);
     }
 
-    Scalar neumannSat(const GlobalPosition& globalPos, const Intersection& intersection, Scalar factor) const
-    {
-        return 0;
-    }
-
     Scalar initSat (const GlobalPosition& globalPos, const Element& element) const
     {
         return 0.0;