diff --git a/tutorials/lagrangian/reactingParcelFoam/cylinder/constant/chemistryProperties b/tutorials/lagrangian/reactingParcelFoam/cylinder/constant/chemistryProperties
index d7830cd44e..a5128ba625 100644
--- a/tutorials/lagrangian/reactingParcelFoam/cylinder/constant/chemistryProperties
+++ b/tutorials/lagrangian/reactingParcelFoam/cylinder/constant/chemistryProperties
@@ -18,7 +18,7 @@ FoamFile
 chemistryType
 {
     chemistrySolver   noChemistrySolver;
-    chemistryThermo   psi;
+    chemistryThermo   rho;
 }
 
 chemistry       off;
diff --git a/tutorials/lagrangian/reactingParcelFoam/cylinder/constant/combustionProperties b/tutorials/lagrangian/reactingParcelFoam/cylinder/constant/combustionProperties
index ba10c40e15..4f553732d0 100644
--- a/tutorials/lagrangian/reactingParcelFoam/cylinder/constant/combustionProperties
+++ b/tutorials/lagrangian/reactingParcelFoam/cylinder/constant/combustionProperties
@@ -15,7 +15,7 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-combustionModel  PaSR<psiChemistryCombustion>;
+combustionModel  PaSR<rhoChemistryCombustion>;
 
 active  false;
 
diff --git a/tutorials/lagrangian/reactingParcelFoam/cylinder/constant/thermophysicalProperties b/tutorials/lagrangian/reactingParcelFoam/cylinder/constant/thermophysicalProperties
index 35a78300b4..3fc2b53740 100644
--- a/tutorials/lagrangian/reactingParcelFoam/cylinder/constant/thermophysicalProperties
+++ b/tutorials/lagrangian/reactingParcelFoam/cylinder/constant/thermophysicalProperties
@@ -17,7 +17,7 @@ FoamFile
 
 thermoType
 {
-    type            hePsiThermo;
+    type            heRhoThermo;
     mixture         reactingMixture;
     transport       sutherland;
     thermo          janaf;
diff --git a/tutorials/lagrangian/reactingParcelFoam/hotBoxes/constant/chemistryProperties b/tutorials/lagrangian/reactingParcelFoam/hotBoxes/constant/chemistryProperties
index d7830cd44e..a5128ba625 100644
--- a/tutorials/lagrangian/reactingParcelFoam/hotBoxes/constant/chemistryProperties
+++ b/tutorials/lagrangian/reactingParcelFoam/hotBoxes/constant/chemistryProperties
@@ -18,7 +18,7 @@ FoamFile
 chemistryType
 {
     chemistrySolver   noChemistrySolver;
-    chemistryThermo   psi;
+    chemistryThermo   rho;
 }
 
 chemistry       off;
diff --git a/tutorials/lagrangian/reactingParcelFoam/hotBoxes/constant/combustionProperties b/tutorials/lagrangian/reactingParcelFoam/hotBoxes/constant/combustionProperties
index 2dafc678c2..3d8f12afb4 100644
--- a/tutorials/lagrangian/reactingParcelFoam/hotBoxes/constant/combustionProperties
+++ b/tutorials/lagrangian/reactingParcelFoam/hotBoxes/constant/combustionProperties
@@ -15,7 +15,7 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-combustionModel  laminar<psiChemistryCombustion>;
+combustionModel  laminar<rhoChemistryCombustion>;
 
 active  false;
 
diff --git a/tutorials/lagrangian/reactingParcelFoam/hotBoxes/constant/thermophysicalProperties b/tutorials/lagrangian/reactingParcelFoam/hotBoxes/constant/thermophysicalProperties
index 35a78300b4..3fc2b53740 100644
--- a/tutorials/lagrangian/reactingParcelFoam/hotBoxes/constant/thermophysicalProperties
+++ b/tutorials/lagrangian/reactingParcelFoam/hotBoxes/constant/thermophysicalProperties
@@ -17,7 +17,7 @@ FoamFile
 
 thermoType
 {
-    type            hePsiThermo;
+    type            heRhoThermo;
     mixture         reactingMixture;
     transport       sutherland;
     thermo          janaf;
diff --git a/tutorials/lagrangian/reactingParcelFoam/hotBoxes/si b/tutorials/lagrangian/reactingParcelFoam/hotBoxes/si
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/constant/chemistryProperties b/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/constant/chemistryProperties
index d7830cd44e..a5128ba625 100644
--- a/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/constant/chemistryProperties
+++ b/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/constant/chemistryProperties
@@ -18,7 +18,7 @@ FoamFile
 chemistryType
 {
     chemistrySolver   noChemistrySolver;
-    chemistryThermo   psi;
+    chemistryThermo   rho;
 }
 
 chemistry       off;
diff --git a/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/constant/combustionProperties b/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/constant/combustionProperties
index 2dafc678c2..3d8f12afb4 100644
--- a/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/constant/combustionProperties
+++ b/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/constant/combustionProperties
@@ -15,7 +15,7 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-combustionModel  laminar<psiChemistryCombustion>;
+combustionModel  laminar<rhoChemistryCombustion>;
 
 active  false;
 
diff --git a/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/constant/thermophysicalProperties b/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/constant/thermophysicalProperties
index 35a78300b4..3fc2b53740 100644
--- a/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/constant/thermophysicalProperties
+++ b/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/constant/thermophysicalProperties
@@ -17,7 +17,7 @@ FoamFile
 
 thermoType
 {
-    type            hePsiThermo;
+    type            heRhoThermo;
     mixture         reactingMixture;
     transport       sutherland;
     thermo          janaf;
diff --git a/tutorials/lagrangian/reactingParcelFoam/splashPanel/constant/chemistryProperties b/tutorials/lagrangian/reactingParcelFoam/splashPanel/constant/chemistryProperties
index d7830cd44e..a5128ba625 100644
--- a/tutorials/lagrangian/reactingParcelFoam/splashPanel/constant/chemistryProperties
+++ b/tutorials/lagrangian/reactingParcelFoam/splashPanel/constant/chemistryProperties
@@ -18,7 +18,7 @@ FoamFile
 chemistryType
 {
     chemistrySolver   noChemistrySolver;
-    chemistryThermo   psi;
+    chemistryThermo   rho;
 }
 
 chemistry       off;
diff --git a/tutorials/lagrangian/reactingParcelFoam/splashPanel/constant/combustionProperties b/tutorials/lagrangian/reactingParcelFoam/splashPanel/constant/combustionProperties
index 2dafc678c2..3d8f12afb4 100644
--- a/tutorials/lagrangian/reactingParcelFoam/splashPanel/constant/combustionProperties
+++ b/tutorials/lagrangian/reactingParcelFoam/splashPanel/constant/combustionProperties
@@ -15,7 +15,7 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-combustionModel  laminar<psiChemistryCombustion>;
+combustionModel  laminar<rhoChemistryCombustion>;
 
 active  false;
 
diff --git a/tutorials/lagrangian/reactingParcelFoam/splashPanel/constant/thermophysicalProperties b/tutorials/lagrangian/reactingParcelFoam/splashPanel/constant/thermophysicalProperties
index 35a78300b4..3fc2b53740 100644
--- a/tutorials/lagrangian/reactingParcelFoam/splashPanel/constant/thermophysicalProperties
+++ b/tutorials/lagrangian/reactingParcelFoam/splashPanel/constant/thermophysicalProperties
@@ -17,7 +17,7 @@ FoamFile
 
 thermoType
 {
-    type            hePsiThermo;
+    type            heRhoThermo;
     mixture         reactingMixture;
     transport       sutherland;
     thermo          janaf;
diff --git a/tutorials/mesh/parallel/filter/0.orig/p b/tutorials/mesh/parallel/filter/0.orig/p
index 6deac046a8..7d9e755a5d 100644
--- a/tutorials/mesh/parallel/filter/0.orig/p
+++ b/tutorials/mesh/parallel/filter/0.orig/p
@@ -10,12 +10,11 @@ FoamFile
     version     2.0;
     format      ascii;
     class       volScalarField;
-    location    "1";
     object      p;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-dimensions      [ 1 -1 -2 0 0 0 0 ];
+dimensions      [1 -1 -2 0 0 0 0];
 
 internalField   uniform 100000;
 
@@ -23,33 +22,42 @@ boundaryField
 {
     walls
     {
-        type            zeroGradient;
+        type            calculated;
+        value           $internalField;
     }
+
     inlet
     {
-        type            zeroGradient;
+        type            calculated;
+        value           $internalField;
     }
+
     outlet
     {
-        type            fixedValue;
-        value           uniform 100000;
+        type            calculated;
+        value           $internalField;
     }
+
     cycLeft_half0
     {
         type            cyclic;
     }
+
     cycRight_half0
     {
         type            cyclic;
     }
+
     frontAndBack
     {
         type            empty;
     }
+
     cycLeft_half1
     {
         type            cyclic;
     }
+
     cycRight_half1
     {
         type            cyclic;
diff --git a/tutorials/mesh/parallel/filter/constant/combustionProperties b/tutorials/mesh/parallel/filter/constant/combustionProperties
index 93afc3cd0a..3d8f12afb4 100644
--- a/tutorials/mesh/parallel/filter/constant/combustionProperties
+++ b/tutorials/mesh/parallel/filter/constant/combustionProperties
@@ -15,15 +15,12 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-combustionModel  PaSR<rhoChemistryCombustion>;
+combustionModel  laminar<rhoChemistryCombustion>;
 
 active  false;
 
-PaSRCoeffs
-{
-    Cmix                1.0;
-    turbulentReaction   off;
-}
+laminarCoeffs
+{}
 
 
 // ************************************************************************* //
diff --git a/tutorials/mesh/parallel/filter/constant/thermophysicalProperties b/tutorials/mesh/parallel/filter/constant/thermophysicalProperties
index 1586320904..56d265f7aa 100644
--- a/tutorials/mesh/parallel/filter/constant/thermophysicalProperties
+++ b/tutorials/mesh/parallel/filter/constant/thermophysicalProperties
@@ -36,16 +36,11 @@ foamChemistryThermoFile "$FOAM_CASE/constant/thermo.incompressiblePoly";
 
 liquids
 {
-    H2O
-    {
-        defaultCoeffs   yes;
-    }
+    H2O;
 }
 
 solids
-{
-    // none
-}
+{}
 
 inertSpecie     N2;
 
diff --git a/tutorials/mesh/parallel/filter/system/fvSolution b/tutorials/mesh/parallel/filter/system/fvSolution
index ab5ba3875d..93cfefe381 100644
--- a/tutorials/mesh/parallel/filter/system/fvSolution
+++ b/tutorials/mesh/parallel/filter/system/fvSolution
@@ -47,23 +47,17 @@ solvers
         relTol          0;
     }
 
-    p
+    p_rgh
     {
         solver          GAMG;
         tolerance       0;
         relTol          0.1;
         smoother        GaussSeidel;
-        nPreSweeps      0;
-        nPostSweeps     2;
-        cacheAgglomeration true;
-        nCellsInCoarsestLevel 10;
-        agglomerator    faceAreaPair;
-        mergeLevels     1;
     }
 
-    pFinal
+    p_rghFinal
     {
-        $p;
+        $p_rgh;
         tolerance       1e-06;
         relTol          0;
     }
@@ -99,9 +93,6 @@ PIMPLE
 
 relaxationFactors
 {
-    fields
-    {
-    }
     equations
     {
         ".*Final"       1;