diff --git a/applications/solvers/surfaceTracking/bubbleInterTrackFoam/bubbleInterTrackFoam.C b/applications/solvers/surfaceTracking/bubbleInterTrackFoam/bubbleInterTrackFoam.C
index 88ef19848..e47aac371 100644
--- a/applications/solvers/surfaceTracking/bubbleInterTrackFoam/bubbleInterTrackFoam.C
+++ b/applications/solvers/surfaceTracking/bubbleInterTrackFoam/bubbleInterTrackFoam.C
@@ -37,7 +37,7 @@ Description
 #include "inletOutletFvPatchFields.H"
 #include "fixedGradientFvPatchFields.H"
 #include "boundBox.H"
-
+#include "pimpleControl.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -46,6 +46,9 @@ int main(int argc, char *argv[])
 #   include "setRootCase.H"
 #   include "createTime.H"
 #   include "createDynamicFvMesh.H"
+
+    pimpleControl pimple(mesh);
+
 #   include "createFields.H"
 #   include "initContinuityErrs.H"
 #   include "createBubble.H"
@@ -59,8 +62,6 @@ int main(int argc, char *argv[])
     {
         Info << "Time = " << runTime.value() << endl << endl;
 
-#       include "readPISOControls.H"
-
         interface.moveMeshPointsForOldFreeSurfDisplacement();
 
         interface.updateDisplacementDirections();
@@ -70,7 +71,7 @@ int main(int argc, char *argv[])
         Info<< "\nMax surface Courant Number = "
             << interface.maxCourantNumber() << endl << endl;
 
-        for (int corr=0; corr<nOuterCorr; corr++)
+        while (pimple.loop())
         {
             // Update interface bc
             interface.updateBoundaryConditions();
@@ -91,7 +92,7 @@ int main(int argc, char *argv[])
             solve(UEqn == -fvc::grad(p));
 
             // --- PISO loop
-            for (int i=0; i<nCorr; i++)
+            while (pimple.correct())
             {
                 volScalarField AU = UEqn.A();
 
@@ -104,7 +105,7 @@ int main(int argc, char *argv[])
 #               include "scaleSpacePhi.H"
 
                 // Non-orthogonal pressure corrector loop
-                for (label nonOrth=0; nonOrth<=nNonOrthCorr; nonOrth++)
+                while (pimple.correctNonOrthogonal())
                 {
                     fvScalarMatrix pEqn
                     (
@@ -116,7 +117,7 @@ int main(int argc, char *argv[])
 
                     pEqn.solve();
 
-                    if (nonOrth == nNonOrthCorr)
+                    if (pimple.finalNonOrthogonalIter())
                     {
                         phi -= pEqn.flux();
                     }
diff --git a/applications/solvers/surfaceTracking/bubbleInterTrackFoam/createFields.H b/applications/solvers/surfaceTracking/bubbleInterTrackFoam/createFields.H
index 25256d07a..a14fdb66f 100644
--- a/applications/solvers/surfaceTracking/bubbleInterTrackFoam/createFields.H
+++ b/applications/solvers/surfaceTracking/bubbleInterTrackFoam/createFields.H
@@ -122,3 +122,4 @@ if (interface.twoFluids())
 
 #   include "setRefCell.H"
 
+mesh.schemesDict().setFluxRequired(p.name());
diff --git a/applications/solvers/surfaceTracking/include/setRefCell.H b/applications/solvers/surfaceTracking/include/setRefCell.H
index c50161301..3bd7f2330 100644
--- a/applications/solvers/surfaceTracking/include/setRefCell.H
+++ b/applications/solvers/surfaceTracking/include/setRefCell.H
@@ -28,7 +28,7 @@ pNeedRef = returnReduce<bool>(pNeedRef, andOp<bool>());
 // Find reference cell
 if (pNeedRef)
 {
-    point refPointi(mesh.solutionDict().subDict("PISO").lookup("pRefPoint"));
+    point refPointi(mesh.solutionDict().subDict("PIMPLE").lookup("pRefPoint"));
     label refCelli = mesh.findCell(refPointi);
     label hasRef = (refCelli >= 0 ? 1 : 0);
     label sumHasRef = returnReduce<label>(hasRef, sumOp<label>());
@@ -50,6 +50,6 @@ if (pNeedRef)
     }
 
     pRefValue =
-        readScalar(mesh.solutionDict().subDict("PISO").lookup("pRefValue"));
+        readScalar(mesh.solutionDict().subDict("PIMPLE").lookup("pRefValue"));
 }
 
diff --git a/applications/solvers/surfaceTracking/interTrackFoam/createFields.H b/applications/solvers/surfaceTracking/interTrackFoam/createFields.H
index 7ecde62de..55b55a63f 100644
--- a/applications/solvers/surfaceTracking/interTrackFoam/createFields.H
+++ b/applications/solvers/surfaceTracking/interTrackFoam/createFields.H
@@ -121,3 +121,4 @@ if (interface.twoFluids())
 
 #   include "setRefCell.H"
 
+mesh.schemesDict().setFluxRequired(p.name());
diff --git a/applications/solvers/surfaceTracking/interTrackFoam/interTrackFoam.C b/applications/solvers/surfaceTracking/interTrackFoam/interTrackFoam.C
index 3873525da..8fcca7da2 100644
--- a/applications/solvers/surfaceTracking/interTrackFoam/interTrackFoam.C
+++ b/applications/solvers/surfaceTracking/interTrackFoam/interTrackFoam.C
@@ -34,7 +34,7 @@ Description
 #include "fvCFD.H"
 #include "dynamicFvMesh.H"
 #include "freeSurface.H"
-
+#include "pimpleControl.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -46,6 +46,8 @@ int main(int argc, char *argv[])
 
 #   include "createDynamicFvMesh.H"
 
+    pimpleControl pimple(mesh);
+
 #   include "createFields.H"
 
 #   include "initContinuityErrs.H"
@@ -58,8 +60,6 @@ int main(int argc, char *argv[])
     {
         Info << "Time = " << runTime.value() << endl << endl;
 
-#       include "readPISOControls.H"
-
         interface.moveMeshPointsForOldFreeSurfDisplacement();
 
         interface.updateDisplacementDirections();
@@ -69,7 +69,7 @@ int main(int argc, char *argv[])
         Info<< "\nMax surface Courant Number = "
             << interface.maxCourantNumber() << endl << endl;
 
-        for (int corr=0; corr<nOuterCorr; corr++)
+        while (pimple.loop())
         {
             // Update interface bc
             interface.updateBoundaryConditions();
@@ -89,7 +89,7 @@ int main(int argc, char *argv[])
             solve(UEqn == -fvc::grad(p));
 
             // --- PISO loop
-            for (int i=0; i<nCorr; i++)
+            while (pimple.correct())
             {
                 volScalarField AU = UEqn.A();
 
@@ -100,7 +100,7 @@ int main(int argc, char *argv[])
 #               include "scalePhi.H"
 
                 // Non-orthogonal pressure corrector loop
-                for (label nonOrth=0; nonOrth<=nNonOrthCorr; nonOrth++)
+                while (pimple.correctNonOrthogonal())
                 {
                     fvScalarMatrix pEqn
                     (
@@ -112,7 +112,7 @@ int main(int argc, char *argv[])
 
                     pEqn.solve();
 
-                    if (nonOrth == nNonOrthCorr)
+                    if (pimple.finalNonOrthogonalIter())
                     {
                         phi -= pEqn.flux();
                     }
diff --git a/tutorials/surfaceTracking/bubbleInterTrackFoam/bubble2D_r0.75mm/system/fvSchemes b/tutorials/surfaceTracking/bubbleInterTrackFoam/bubble2D_r0.75mm/system/fvSchemes
index 50109da88..3bd187129 100644
--- a/tutorials/surfaceTracking/bubbleInterTrackFoam/bubble2D_r0.75mm/system/fvSchemes
+++ b/tutorials/surfaceTracking/bubbleInterTrackFoam/bubble2D_r0.75mm/system/fvSchemes
@@ -50,9 +50,4 @@ snGradSchemes
     default corrected;
 }
 
-fluxRequired
-{
-    p;
-}
-
 // ************************************************************************* //
diff --git a/tutorials/surfaceTracking/bubbleInterTrackFoam/bubble2D_r0.75mm/system/fvSolution b/tutorials/surfaceTracking/bubbleInterTrackFoam/bubble2D_r0.75mm/system/fvSolution
index 8e79f00a2..465d36902 100644
--- a/tutorials/surfaceTracking/bubbleInterTrackFoam/bubble2D_r0.75mm/system/fvSolution
+++ b/tutorials/surfaceTracking/bubbleInterTrackFoam/bubble2D_r0.75mm/system/fvSolution
@@ -34,7 +34,7 @@ solvers
     }
 }
 
-PISO
+PIMPLE
 {
     nOuterCorrectors            6;
     nCorrectors                 2;
diff --git a/tutorials/surfaceTracking/interTrackFoam/hydrofoil/system/fvSchemes b/tutorials/surfaceTracking/interTrackFoam/hydrofoil/system/fvSchemes
index 8ba1da03e..5d70d9763 100644
--- a/tutorials/surfaceTracking/interTrackFoam/hydrofoil/system/fvSchemes
+++ b/tutorials/surfaceTracking/interTrackFoam/hydrofoil/system/fvSchemes
@@ -49,9 +49,4 @@ snGradSchemes
     default corrected;
 }
 
-fluxRequired
-{
-    p;
-}
-
 // ************************************************************************* //
diff --git a/tutorials/surfaceTracking/interTrackFoam/hydrofoil/system/fvSolution b/tutorials/surfaceTracking/interTrackFoam/hydrofoil/system/fvSolution
index d25e93e30..2a5c70b26 100644
--- a/tutorials/surfaceTracking/interTrackFoam/hydrofoil/system/fvSolution
+++ b/tutorials/surfaceTracking/interTrackFoam/hydrofoil/system/fvSolution
@@ -34,7 +34,7 @@ solvers
     }
 }
 
-PISO
+PIMPLE
 {
     nOuterCorrectors            5;
     nCorrectors                 2;
diff --git a/tutorials/surfaceTracking/interTrackFoam/ramp/system/fvSchemes b/tutorials/surfaceTracking/interTrackFoam/ramp/system/fvSchemes
index 7a77347bb..6a7bdb8c5 100644
--- a/tutorials/surfaceTracking/interTrackFoam/ramp/system/fvSchemes
+++ b/tutorials/surfaceTracking/interTrackFoam/ramp/system/fvSchemes
@@ -51,9 +51,4 @@ snGradSchemes
     default corrected;
 }
 
-fluxRequired
-{
-    p                   0;
-}
-
 // ************************************************************************* //
diff --git a/tutorials/surfaceTracking/interTrackFoam/ramp/system/fvSolution b/tutorials/surfaceTracking/interTrackFoam/ramp/system/fvSolution
index 30b9daefc..32af9de10 100644
--- a/tutorials/surfaceTracking/interTrackFoam/ramp/system/fvSolution
+++ b/tutorials/surfaceTracking/interTrackFoam/ramp/system/fvSolution
@@ -34,7 +34,7 @@ solvers
     }
 }
 
-PISO
+PIMPLE
 {
     nOuterCorrectors            10;
     nCorrectors                 2;
diff --git a/tutorials/surfaceTracking/interTrackFoam/sloshing2D/system/fvSchemes b/tutorials/surfaceTracking/interTrackFoam/sloshing2D/system/fvSchemes
index 01cb826dc..469b1a5ac 100644
--- a/tutorials/surfaceTracking/interTrackFoam/sloshing2D/system/fvSchemes
+++ b/tutorials/surfaceTracking/interTrackFoam/sloshing2D/system/fvSchemes
@@ -49,9 +49,4 @@ snGradSchemes
     default         corrected;
 }
 
-fluxRequired
-{
-    p;
-}
-
 // ************************************************************************* //
diff --git a/tutorials/surfaceTracking/interTrackFoam/sloshing2D/system/fvSolution b/tutorials/surfaceTracking/interTrackFoam/sloshing2D/system/fvSolution
index 658fcc4f7..a227c32ac 100644
--- a/tutorials/surfaceTracking/interTrackFoam/sloshing2D/system/fvSolution
+++ b/tutorials/surfaceTracking/interTrackFoam/sloshing2D/system/fvSolution
@@ -34,7 +34,7 @@ solvers
     }
 }
 
-PISO
+PIMPLE
 {
     nOuterCorrectors            10;
     nCorrectors                 2;
diff --git a/tutorials/surfaceTracking/interTrackFoam/tank3D/system/fvSchemes b/tutorials/surfaceTracking/interTrackFoam/tank3D/system/fvSchemes
index 2d73ad214..2aa0bd0bc 100644
--- a/tutorials/surfaceTracking/interTrackFoam/tank3D/system/fvSchemes
+++ b/tutorials/surfaceTracking/interTrackFoam/tank3D/system/fvSchemes
@@ -48,9 +48,4 @@ snGradSchemes
     default corrected;
 }
 
-fluxRequired
-{
-    p;
-}
-
 // ************************************************************************* //
diff --git a/tutorials/surfaceTracking/interTrackFoam/tank3D/system/fvSolution b/tutorials/surfaceTracking/interTrackFoam/tank3D/system/fvSolution
index 30b9daefc..32af9de10 100644
--- a/tutorials/surfaceTracking/interTrackFoam/tank3D/system/fvSolution
+++ b/tutorials/surfaceTracking/interTrackFoam/tank3D/system/fvSolution
@@ -34,7 +34,7 @@ solvers
     }
 }
 
-PISO
+PIMPLE
 {
     nOuterCorrectors            10;
     nCorrectors                 2;