diff --git a/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D/0/CH4 b/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D/0/CH4
index aa5d46ff58..5074f0d0e7 100644
--- a/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D/0/CH4
+++ b/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D/0/CH4
@@ -10,34 +10,35 @@ FoamFile
     version     2.0;
     format      ascii;
     class       volScalarField;
-    location    "0";
     object      CH4;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 dimensions      [0 0 0 0 0 0 0];
 
-internalField   uniform 0.0;
+internalField   uniform 0;
 
 boundaryField
 {
     fuel
     {
         type            fixedValue;
-        value           uniform 1.0;
+        value           uniform 1;
     }
+
     air
     {
         type            fixedValue;
-        value           uniform 0.0;
+        value           uniform 0;
     }
+
     outlet
     {
         type            inletOutlet;
-        inletValue      uniform 0.0;
-        value           uniform 0.0;
-
+        inletValue      uniform 0;
+        value           uniform 0;
     }
+
     frontAndBack
     {
         type            empty;
diff --git a/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D/0/CO2 b/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D/0/CO2
index ab2f76c425..d3ea0e9680 100644
--- a/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D/0/CO2
+++ b/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D/0/CO2
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       volScalarField;
-    location    "0";
     object      CO2;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -21,23 +20,19 @@ internalField   uniform 0;
 
 boundaryField
 {
-    fuel
-    {
-        type            fixedValue;
-        value           uniform 0;
-    }
-    air
+    "(fuel|air)"
     {
         type            fixedValue;
         value           uniform 0;
     }
+
     outlet
     {
         type            inletOutlet;
         inletValue      uniform 0;
         value           uniform 0;
-
     }
+
     frontAndBack
     {
         type            empty;
diff --git a/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D/0/H2O b/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D/0/H2O
index 2ae517b27f..d0dbfef887 100644
--- a/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D/0/H2O
+++ b/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D/0/H2O
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       volScalarField;
-    location    "0";
     object      H2O;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D/0/N2 b/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D/0/N2
index 62e1ef202e..fb12cb70cb 100644
--- a/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D/0/N2
+++ b/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D/0/N2
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       volScalarField;
-    location    "0";
     object      N2;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -26,18 +25,20 @@ boundaryField
         type            fixedValue;
         value           uniform 0.0;
     }
+
     air
     {
         type            fixedValue;
         value           uniform 0.77;
     }
+
     outlet
     {
         type            inletOutlet;
         inletValue      uniform 1;
         value           uniform 1;
-
     }
+
     frontAndBack
     {
         type            empty;
diff --git a/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D/0/O2 b/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D/0/O2
index 506f04ecb9..ee7433eaff 100644
--- a/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D/0/O2
+++ b/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D/0/O2
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       volScalarField;
-    location    "0";
     object      O2;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -24,19 +23,22 @@ boundaryField
     fuel
     {
         type            fixedValue;
-        value           uniform 0.0;
+        value           uniform 0;
     }
+
     air
     {
         type            fixedValue;
         value           uniform 0.23;
     }
+
     outlet
     {
         type            inletOutlet;
         inletValue      uniform 0;
         value           uniform 0;
     }
+
     frontAndBack
     {
         type            empty;
diff --git a/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D/0/T b/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D/0/T
index 2a5121fb07..31ddd7db75 100644
--- a/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D/0/T
+++ b/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D/0/T
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       volScalarField;
-    location    "0";
     object      T;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -21,22 +20,19 @@ internalField   uniform 2000;
 
 boundaryField
 {
-    fuel
-    {
-        type            fixedValue;
-        value           uniform 293;
-    }
-    air
+    "(fuel|air)"
     {
         type            fixedValue;
         value           uniform 293;
     }
+
     outlet
     {
         type            inletOutlet;
         inletValue      uniform 293;
         value           uniform 293;
     }
+
     frontAndBack
     {
         type            empty;
diff --git a/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D/0/U b/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D/0/U
index 40f4727f52..c192391019 100644
--- a/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D/0/U
+++ b/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D/0/U
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       volVectorField;
-    location    "0";
     object      U;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -26,16 +25,19 @@ boundaryField
         type            fixedValue;
         value           uniform (0.1 0 0);
     }
+
     air
     {
         type            fixedValue;
         value           uniform (-0.1 0 0);
     }
+
     outlet
     {
         type            pressureInletOutletVelocity;
         value           $internalField;
     }
+
     frontAndBack
     {
         type            empty;
diff --git a/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D/0/Ydefault b/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D/0/Ydefault
index b13a5a7aa3..dfc4858899 100644
--- a/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D/0/Ydefault
+++ b/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D/0/Ydefault
@@ -10,34 +10,29 @@ FoamFile
     version     2.0;
     format      ascii;
     class       volScalarField;
-    location    "0";
     object      Ydefault;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 dimensions      [0 0 0 0 0 0 0];
 
-internalField   uniform 0.0;
+internalField   uniform 0;
 
 boundaryField
 {
-    fuel
+    "(fuel|air)"
     {
         type            fixedValue;
-        value           uniform 0.0;
-    }
-    air
-    {
-        type            fixedValue;
-        value           uniform 0.0;
+        value           uniform 0;
     }
+
     outlet
     {
         type            inletOutlet;
-        inletValue      uniform 0.0;
-        value           uniform 0.0;
-
+        inletValue      uniform 0;
+        value           uniform 0;
     }
+
     frontAndBack
     {
         type            empty;
diff --git a/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D/0/alphat b/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D/0/alphat
index d13c439be3..2f2a619e46 100644
--- a/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D/0/alphat
+++ b/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D/0/alphat
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       volScalarField;
-    location    "0";
     object      alphat;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -21,20 +20,17 @@ internalField   uniform 0;
 
 boundaryField
 {
-    fuel
-    {
-        type            fixedValue;
-        value           uniform 0;
-    }
-    air
+    "(fuel|air)"
     {
         type            fixedValue;
         value           uniform 0;
     }
+
     outlet
     {
         type            zeroGradient;
     }
+
     frontAndBack
     {
         type            empty;
diff --git a/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D/0/p b/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D/0/p
index 470e37aad8..2d13058f89 100644
--- a/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D/0/p
+++ b/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D/0/p
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       volScalarField;
-    location    "0";
     object      p;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -21,19 +20,17 @@ internalField   uniform 1e5;
 
 boundaryField
 {
-    fuel
-    {
-        type            zeroGradient;
-    }
-    air
+    "(fuel|air)"
     {
         type            zeroGradient;
     }
+
     outlet
     {
         type            totalPressure;
         p0              $internalField;
     }
+
     frontAndBack
     {
         type            empty;
diff --git a/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D/constant/chemistryProperties b/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D/constant/chemistryProperties
index 39868c8f63..d48ed1ba9d 100644
--- a/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D/constant/chemistryProperties
+++ b/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D/constant/chemistryProperties
@@ -10,14 +10,13 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      chemistryProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 chemistryType
 {
-    solver            EulerImplicit;
+    solver          EulerImplicit;
 }
 
 chemistry           on;
@@ -37,4 +36,5 @@ odeCoeffs
     relTol          0.01;
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D/constant/combustionProperties b/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D/constant/combustionProperties
index 0d845cb4c5..8c202ef2e7 100644
--- a/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D/constant/combustionProperties
+++ b/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D/constant/combustionProperties
@@ -10,14 +10,13 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      combustionProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 combustionModel  laminar;
 
-active  true;
+active           true;
 
 laminarCoeffs
 {
diff --git a/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D/constant/thermo.compressibleGas b/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D/constant/thermo.compressibleGas
index 88f778a7c0..e009ca623e 100644
--- a/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D/constant/thermo.compressibleGas
+++ b/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D/constant/thermo.compressibleGas
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      thermo.compressibleGas;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D/constant/thermophysicalProperties b/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D/constant/thermophysicalProperties
index 0266f6be0f..0933dc55d3 100644
--- a/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D/constant/thermophysicalProperties
+++ b/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D/constant/thermophysicalProperties
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      thermophysicalProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -26,11 +25,11 @@ thermoType
     specie          specie;
 }
 
-inertSpecie N2;
+inertSpecie         N2;
 
-chemistryReader foamChemistryReader;
+chemistryReader     foamChemistryReader;
 
-foamChemistryFile "<constant>/reactions";
+foamChemistryFile   "<constant>/reactions";
 
 foamChemistryThermoFile "<constant>/thermo.compressibleGas";
 
diff --git a/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D/constant/turbulenceProperties b/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D/constant/turbulenceProperties
index fbd1e3c277..c5b8431641 100644
--- a/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D/constant/turbulenceProperties
+++ b/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D/constant/turbulenceProperties
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      turbulenceProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D/system/FOBilgerMixtureFraction b/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D/system/FOBilgerMixtureFraction
new file mode 100644
index 0000000000..e7fd082126
--- /dev/null
+++ b/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D/system/FOBilgerMixtureFraction
@@ -0,0 +1,46 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  v2006                                 |
+|   \\  /    A nd           | Website:  www.openfoam.com                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+
+BilgerMixtureFraction1
+{
+    // Mandatory entries
+    type            BilgerMixtureFraction;
+    libs            (fieldFunctionObjects);
+
+    fuel
+    {
+        composition moleFractions;
+        CH4         1;
+    }
+
+    oxidiser
+    {
+        composition massFractions;
+        O2          0.23;
+        N2          0.77;
+    }
+
+
+    // Optional entries
+    //phase           "";
+    result          f_Bilger;
+
+    // Optional (inherited) entries
+    region          region0;
+    enabled         true;
+    log             true;
+    timeStart       0;
+    timeEnd         1000;
+    executeControl  timeStep;
+    executeInterval 1;
+    writeControl    writeTime;
+    writeInterval   -1;
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D/system/controlDict b/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D/system/controlDict
index 0b250276b0..c39369b9fc 100644
--- a/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D/system/controlDict
+++ b/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D/system/controlDict
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      controlDict;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -49,5 +48,10 @@ adjustTimeStep  yes;
 
 maxCo           0.4;
 
+functions
+{
+    #include "FOBilgerMixtureFraction"
+}
+
 
 // ************************************************************************* //
diff --git a/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D/system/fvSchemes b/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D/system/fvSchemes
index 289266088f..d56a5372ab 100644
--- a/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D/system/fvSchemes
+++ b/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D/system/fvSchemes
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      fvSchemes;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -34,7 +33,7 @@ divSchemes
     div(phi,K)      Gauss limitedLinear 1;
     div(phid,p)     Gauss limitedLinear 1;
     div(phi,epsilon) Gauss limitedLinear 1;
-    div(phi,k) Gauss limitedLinear 1;
+    div(phi,k)      Gauss limitedLinear 1;
     div(((rho*nuEff)*dev2(T(grad(U))))) Gauss linear;
 }
 
diff --git a/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D/system/fvSolution b/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D/system/fvSolution
index d5e23ddc42..b6da8b0e6b 100644
--- a/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D/system/fvSolution
+++ b/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D/system/fvSolution
@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      fvSolution;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -61,7 +60,7 @@ PIMPLE
 {
     momentumPredictor no;
     nOuterCorrectors  1;
-    nCorrectors     2;
+    nCorrectors       2;
     nNonOrthogonalCorrectors 0;
 }