diff --git a/tutorials/combustion/reactingFoam/RAS/chokedNozzle/0/CH4 b/tutorials/combustion/reactingFoam/RAS/chokedNozzle/0/CH4
index 6646bff3e1..fd69cfbb0a 100644
--- a/tutorials/combustion/reactingFoam/RAS/chokedNozzle/0/CH4
+++ b/tutorials/combustion/reactingFoam/RAS/chokedNozzle/0/CH4
@@ -13,6 +13,7 @@ FoamFile
     location        "0";
     object          CH4;
 }
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 dimensions      [ 0 0 0 0 0 0 0 ];
 
@@ -23,13 +24,13 @@ boundaryField
     inletair
     {
         type            fixedValue;
-        value           uniform 0;
+        value           $internalField;
     }
     outlet
     {
         type            inletOutlet;
-        inletValue      uniform 0;
-        value           uniform 0;
+        inletValue      $internalField;
+        value           $internalField;
     }
     walls
     {
diff --git a/tutorials/combustion/reactingFoam/RAS/chokedNozzle/0/H2 b/tutorials/combustion/reactingFoam/RAS/chokedNozzle/0/H2
index e97a13f925..5cfc0750a9 100644
--- a/tutorials/combustion/reactingFoam/RAS/chokedNozzle/0/H2
+++ b/tutorials/combustion/reactingFoam/RAS/chokedNozzle/0/H2
@@ -13,6 +13,7 @@ FoamFile
     location        "0";
     object          H2;
 }
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 dimensions      [ 0 0 0 0 0 0 0 ];
 
@@ -23,13 +24,13 @@ boundaryField
     inletair
     {
         type            fixedValue;
-        value           uniform 0;
+        value           $internalField;
     }
     outlet
     {
         type            zeroGradient;
-        inletValue      uniform 0;
-        value           uniform 0;
+        inletValue      $internalField;
+        value           $internalField;
     }
     walls
     {
diff --git a/tutorials/combustion/reactingFoam/RAS/chokedNozzle/0/H2O b/tutorials/combustion/reactingFoam/RAS/chokedNozzle/0/H2O
index b74064a7ef..501c31edbf 100644
--- a/tutorials/combustion/reactingFoam/RAS/chokedNozzle/0/H2O
+++ b/tutorials/combustion/reactingFoam/RAS/chokedNozzle/0/H2O
@@ -24,13 +24,13 @@ boundaryField
     inletair
     {
         type            fixedValue;
-        value           uniform 0;
+        value           $internalField;
     }
     outlet
     {
         type            zeroGradient;
-        inletValue      uniform 0;
-        value           uniform 0;
+        inletValue      $internalField;
+        value           $internalField;
     }
     walls
     {
diff --git a/tutorials/combustion/reactingFoam/RAS/chokedNozzle/0/N2 b/tutorials/combustion/reactingFoam/RAS/chokedNozzle/0/N2
index 5a42a569fd..d70446e301 100644
--- a/tutorials/combustion/reactingFoam/RAS/chokedNozzle/0/N2
+++ b/tutorials/combustion/reactingFoam/RAS/chokedNozzle/0/N2
@@ -13,6 +13,7 @@ FoamFile
     location        "0";
     object          N2;
 }
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 dimensions      [ 0 0 0 0 0 0 0 ];
 
@@ -23,13 +24,13 @@ boundaryField
     inletair
     {
         type            fixedValue;
-        value           uniform 0.7;
+        value           $internalField;
     }
     outlet
     {
         type            inletOutlet;
-        inletValue      uniform 0.7;
-        value           uniform 0.7;
+        inletValue      $internalField;
+        value           $internalField;
     }
     walls
     {
diff --git a/tutorials/combustion/reactingFoam/RAS/chokedNozzle/0/O2 b/tutorials/combustion/reactingFoam/RAS/chokedNozzle/0/O2
index 62fc3897e4..c7eec8b997 100644
--- a/tutorials/combustion/reactingFoam/RAS/chokedNozzle/0/O2
+++ b/tutorials/combustion/reactingFoam/RAS/chokedNozzle/0/O2
@@ -13,6 +13,7 @@ FoamFile
     location        "0";
     object          O2;
 }
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 dimensions      [ 0 0 0 0 0 0 0 ];
 
@@ -23,13 +24,13 @@ boundaryField
     inletair
     {
         type            fixedValue;
-        value           uniform 0.3;
+        value           $internalField;
     }
     outlet
     {
         type            inletOutlet;
-        inletValue      uniform 0.3;
-        value           uniform 0.3;
+        inletValue      $internalField;
+        value           $internalField;
     }
     walls
     {
diff --git a/tutorials/combustion/reactingFoam/RAS/chokedNozzle/0/T b/tutorials/combustion/reactingFoam/RAS/chokedNozzle/0/T
index fc1a49a30f..577761dd47 100644
--- a/tutorials/combustion/reactingFoam/RAS/chokedNozzle/0/T
+++ b/tutorials/combustion/reactingFoam/RAS/chokedNozzle/0/T
@@ -13,6 +13,7 @@ FoamFile
     location        "0";
     object          T;
 }
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 dimensions      [ 0 0 0 1 0 0 0 ];
 
@@ -37,8 +38,8 @@ boundaryField
     outlet
     {
         type            inletOutlet;
-        inletValue      uniform 292;
-        value           uniform 292;
+        inletValue      $internalField;
+        value           $internalField;
     }
     walls
     {
diff --git a/tutorials/combustion/reactingFoam/RAS/chokedNozzle/0/U b/tutorials/combustion/reactingFoam/RAS/chokedNozzle/0/U
index 8493ebd635..ee9354681b 100644
--- a/tutorials/combustion/reactingFoam/RAS/chokedNozzle/0/U
+++ b/tutorials/combustion/reactingFoam/RAS/chokedNozzle/0/U
@@ -13,37 +13,36 @@ FoamFile
     location        "0";
     object          U;
 }
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 dimensions      [ 0 1 -1 0 0 0 0 ];
 
-internalField   uniform ( 0 0 0 );
+internalField   uniform (0 0 0);
 
 boundaryField
 {
     inletair
     {
         type            flowRateInletVelocity;
-        value           uniform ( 0 0 0 );
+        value           $internalField;
         massFlowRate    csvFile;
         nHeaderLine     1;
         refColumn       0;
         componentColumns ( 1 );
         separator       ",";
         mergeSeparators no;
-        file             "<constant>/inlet.csv";
-
-
+        file            "<constant>/inlet.csv";
     }
     outlet
     {
         type            pressureInletOutletVelocity;
-        value           uniform (0.0 0 0);
-        inletValue      uniform (0 0 0);
+        inletValue      $internalField;
+        value           $internalField;
     }
     walls
     {
         type            fixedValue;
-        value           uniform ( 0 0 0 );
+        value           $internalField;
     }
 }
 
diff --git a/tutorials/combustion/reactingFoam/RAS/chokedNozzle/0/Ydefault b/tutorials/combustion/reactingFoam/RAS/chokedNozzle/0/Ydefault
index 707ef84052..7b36f3f2cd 100644
--- a/tutorials/combustion/reactingFoam/RAS/chokedNozzle/0/Ydefault
+++ b/tutorials/combustion/reactingFoam/RAS/chokedNozzle/0/Ydefault
@@ -13,6 +13,7 @@ FoamFile
     location        "0";
     object          Ydefault;
 }
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 dimensions      [ 0 0 0 0 0 0 0 ];
 
@@ -23,13 +24,13 @@ boundaryField
     inletair
     {
         type            fixedValue;
-        value           uniform 0;
+        value           $internalField;
     }
     outlet
     {
         type            inletOutlet;
-        inletValue      uniform 0;
-        value           uniform 0;
+        inletValue      $internalField;
+        value           $internalField;
     }
     walls
     {
diff --git a/tutorials/combustion/reactingFoam/RAS/chokedNozzle/0/alphat b/tutorials/combustion/reactingFoam/RAS/chokedNozzle/0/alphat
index b7d5ed0a4d..d0b1f8fdc7 100644
--- a/tutorials/combustion/reactingFoam/RAS/chokedNozzle/0/alphat
+++ b/tutorials/combustion/reactingFoam/RAS/chokedNozzle/0/alphat
@@ -13,6 +13,7 @@ FoamFile
     location        "0";
     object          alphat;
 }
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 dimensions      [ 1 -1 -1 0 0 0 0 ];
 
@@ -23,18 +24,18 @@ boundaryField
     inletair
     {
         type            calculated;
-        value           uniform 0;
+        value           $internalField;
     }
     outlet
     {
         type            calculated;
-        value           uniform 0;
+        value           $internalField;
     }
     walls
     {
         type            compressible::alphatWallFunction;
         Prt             0.85;
-        value           uniform 0;
+        value           $internalField;
     }
 }
 
diff --git a/tutorials/combustion/reactingFoam/RAS/chokedNozzle/0/epsilon b/tutorials/combustion/reactingFoam/RAS/chokedNozzle/0/epsilon
index d7a7e8af59..68e4fdbf30 100644
--- a/tutorials/combustion/reactingFoam/RAS/chokedNozzle/0/epsilon
+++ b/tutorials/combustion/reactingFoam/RAS/chokedNozzle/0/epsilon
@@ -13,6 +13,7 @@ FoamFile
     location        "0";
     object          epsilon;
 }
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 dimensions      [ 0 2 -3 0 0 0 0 ];
 
@@ -26,13 +27,13 @@ boundaryField
         mixingLength    0.005;
         phi             phi;
         k               k;
-        value           uniform 200;
+        value           $internalField;
     }
     outlet
     {
         type            inletOutlet;
-        inletValue      uniform 200;
-        value           uniform 200;
+        inletValue      $internalField;
+        value           $internalField;
     }
     walls
     {
@@ -40,7 +41,7 @@ boundaryField
         Cmu             0.09;
         kappa           0.41;
         E               9.8;
-        value           uniform 200;
+        value           $internalField;
     }
 }
 
diff --git a/tutorials/combustion/reactingFoam/RAS/chokedNozzle/0/k b/tutorials/combustion/reactingFoam/RAS/chokedNozzle/0/k
index c0483677b8..f3d7c496f9 100644
--- a/tutorials/combustion/reactingFoam/RAS/chokedNozzle/0/k
+++ b/tutorials/combustion/reactingFoam/RAS/chokedNozzle/0/k
@@ -13,6 +13,7 @@ FoamFile
     location        "0";
     object          k;
 }
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 dimensions      [ 0 2 -2 0 0 0 0 ];
 
@@ -24,18 +25,18 @@ boundaryField
     {
         type            turbulentIntensityKineticEnergyInlet;
         intensity       0.02;
-        value           uniform 1;
+        value           $internalField;
     }
     outlet
     {
         type            zeroGradient;//inletOutlet;
-        inletValue      uniform 1;
-        value           uniform 1;
+        inletValue      $internalField;
+        value           $internalField;
     }
     walls
     {
         type            kqRWallFunction;
-        value           uniform 1;
+        value           $internalField;
     }
 }
 
diff --git a/tutorials/combustion/reactingFoam/RAS/chokedNozzle/0/nut b/tutorials/combustion/reactingFoam/RAS/chokedNozzle/0/nut
index c8fb8bcbb9..271729cf26 100644
--- a/tutorials/combustion/reactingFoam/RAS/chokedNozzle/0/nut
+++ b/tutorials/combustion/reactingFoam/RAS/chokedNozzle/0/nut
@@ -24,12 +24,12 @@ boundaryField
     inletair
     {
         type            calculated;
-        value           uniform 0;
+        value           $internalField;
     }
     outlet
     {
         type            calculated;
-        value           uniform 0;
+        value           $internalField;
     }
     walls
     {
@@ -37,7 +37,7 @@ boundaryField
         Cmu             0.09;
         kappa           0.41;
         E               9.8;
-        value           uniform 0;
+        value           $internalField;
     }
 }
 
diff --git a/tutorials/combustion/reactingFoam/RAS/chokedNozzle/0/p b/tutorials/combustion/reactingFoam/RAS/chokedNozzle/0/p
index 2ae5c64b26..b651e96601 100644
--- a/tutorials/combustion/reactingFoam/RAS/chokedNozzle/0/p
+++ b/tutorials/combustion/reactingFoam/RAS/chokedNozzle/0/p
@@ -13,6 +13,7 @@ FoamFile
     location        "0";
     object          p;
 }
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 dimensions      [ 1 -1 -2 0 0 0 0 ];
 
@@ -31,7 +32,7 @@ boundaryField
         choked          true;
         relax           0.1;
         M               0.3;
-        value           uniform 250000;
+        value           $internalField;
     }
     walls
     {
diff --git a/tutorials/combustion/reactingFoam/RAS/chokedNozzle/constant/chemistryProperties b/tutorials/combustion/reactingFoam/RAS/chokedNozzle/constant/chemistryProperties
index db74c415b8..5d33d38982 100644
--- a/tutorials/combustion/reactingFoam/RAS/chokedNozzle/constant/chemistryProperties
+++ b/tutorials/combustion/reactingFoam/RAS/chokedNozzle/constant/chemistryProperties
@@ -7,12 +7,13 @@
 \*---------------------------------------------------------------------------*/
 FoamFile
 {
-    version         2;
-    format          ascii;
-    class           dictionary;
-    location        "constant";
-    object          chemistryProperties;
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    location    "constant";
+    object      chemistryProperties;
 }
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 chemistryType
 {
diff --git a/tutorials/combustion/reactingFoam/RAS/chokedNozzle/system/blockMeshDict b/tutorials/combustion/reactingFoam/RAS/chokedNozzle/system/blockMeshDict
index 15a3591475..bf075f965a 100644
--- a/tutorials/combustion/reactingFoam/RAS/chokedNozzle/system/blockMeshDict
+++ b/tutorials/combustion/reactingFoam/RAS/chokedNozzle/system/blockMeshDict
@@ -20,15 +20,15 @@ vertices
 (
     (0.00  0.25  0)    //  0
     (1.00  0.25  0)    //  1
-    (1.25  0.00  -0.6)    //  2
-    (2.25  0.00  -0.6)    //  3
+    (1.25  0.00  -0.6) //  2
+    (2.25  0.00  -0.6) //  3
     (2.50  0.25  0)    //  4
-    (4.00  0.35  0.2)    //  5
+    (4.00  0.35  0.2)  //  5
 
-    (4.00  0.45  0.2)    //  6
+    (4.00  0.45  0.2)  //  6
     (2.50  0.75  0)    //  7
-    (2.25  1.00  -0.6)    //  8
-    (1.25  1.00  -0.6)    //  9
+    (2.25  1.00  -0.6) //  8
+    (1.25  1.00  -0.6) //  9
     (1.00  0.75  0)    // 10
     (0.00  0.75  0)    // 11
 
diff --git a/tutorials/combustion/reactingFoam/RAS/chokedNozzle/system/controlDict b/tutorials/combustion/reactingFoam/RAS/chokedNozzle/system/controlDict
index 2e1180245e..2e6953ef93 100644
--- a/tutorials/combustion/reactingFoam/RAS/chokedNozzle/system/controlDict
+++ b/tutorials/combustion/reactingFoam/RAS/chokedNozzle/system/controlDict
@@ -1,4 +1,4 @@
-;/*--------------------------------*- C++ -*----------------------------------*\
+/*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  v1812                                 |
@@ -7,12 +7,13 @@
 \*---------------------------------------------------------------------------*/
 FoamFile
 {
-    version         2;
-    format          ascii;
-    class           dictionary;
-    location        "system";
-    object          controlDict;
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    location    "system";
+    object      controlDict;
 }
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 application     reactingFoam;
 
@@ -20,7 +21,7 @@ startFrom       startTime;
 
 startTime       0;
 
-stopAt          writeNow;   //endTime;
+stopAt          endTime;
 
 endTime         1;
 
@@ -51,17 +52,4 @@ maxCo           0.3;
 maxDeltaT       0.25;
 
 
-functions
-{
-    ywalls
-    {
-        type        writeObjects;
-        libs        ("libutilityFunctionObjects.so");
-        objects     (ywalls);
-        writeOption anyWrite;
-    }
-}
-
-
-
 // ************************************************************************* //
diff --git a/tutorials/combustion/reactingFoam/RAS/chokedNozzle/system/fvSchemes b/tutorials/combustion/reactingFoam/RAS/chokedNozzle/system/fvSchemes
index fc6abf5b80..860245a906 100644
--- a/tutorials/combustion/reactingFoam/RAS/chokedNozzle/system/fvSchemes
+++ b/tutorials/combustion/reactingFoam/RAS/chokedNozzle/system/fvSchemes
@@ -7,12 +7,13 @@
 \*---------------------------------------------------------------------------*/
 FoamFile
 {
-    version         2;
-    format          ascii;
-    class           dictionary;
-    location        "system";
-    object          fvSchemes;
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    location    "system";
+    object      fvSchemes;
 }
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 ddtSchemes
 {
diff --git a/tutorials/combustion/reactingFoam/RAS/chokedNozzle/system/fvSolution b/tutorials/combustion/reactingFoam/RAS/chokedNozzle/system/fvSolution
index f450da2bc0..620265a5c5 100644
--- a/tutorials/combustion/reactingFoam/RAS/chokedNozzle/system/fvSolution
+++ b/tutorials/combustion/reactingFoam/RAS/chokedNozzle/system/fvSolution
@@ -7,12 +7,13 @@
 \*---------------------------------------------------------------------------*/
 FoamFile
 {
-    version         2;
-    format          ascii;
-    class           dictionary;
-    location        "system";
-    object          fvSolution;
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    location    "system";
+    object      fvSolution;
 }
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 solvers
 {