diff --git a/tutorials/combustion/fireFoam/les/oppositeBurningPanels/constant/turbulenceProperties b/tutorials/combustion/fireFoam/les/oppositeBurningPanels/constant/turbulenceProperties
index 94eb369ba1..0973192685 100644
--- a/tutorials/combustion/fireFoam/les/oppositeBurningPanels/constant/turbulenceProperties
+++ b/tutorials/combustion/fireFoam/les/oppositeBurningPanels/constant/turbulenceProperties
@@ -96,4 +96,5 @@ LES
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/combustion/fireFoam/les/smallPoolFire2D/0/CH4 b/tutorials/combustion/fireFoam/les/smallPoolFire2D/0/CH4
index 0c17615d4c..581a479e0e 100644
--- a/tutorials/combustion/fireFoam/les/smallPoolFire2D/0/CH4
+++ b/tutorials/combustion/fireFoam/les/smallPoolFire2D/0/CH4
@@ -21,18 +21,11 @@ internalField   uniform 0;
 
 boundaryField
 {
-    outlet
+    "(outlet|sides)"
     {
         type            inletOutlet;
-        inletValue      uniform 0;
-        value           uniform 0;
-    }
-
-    sides
-    {
-        type            inletOutlet;
-        inletValue      uniform 0;
-        value           uniform 0;
+        inletValue      $internalField;
+        value           $internalField;
     }
 
     base
diff --git a/tutorials/combustion/fireFoam/les/smallPoolFire2D/0/N2 b/tutorials/combustion/fireFoam/les/smallPoolFire2D/0/N2
index 248e3fa02d..1aebf7e1bc 100644
--- a/tutorials/combustion/fireFoam/les/smallPoolFire2D/0/N2
+++ b/tutorials/combustion/fireFoam/les/smallPoolFire2D/0/N2
@@ -21,24 +21,22 @@ internalField   uniform 0.76699;
 
 boundaryField
 {
-    outlet
-    {
-        type            calculated;
-    }
-
-    sides
+    "(outlet|sides)"
     {
         type            calculated;
+        value           $internalField;
     }
 
     base
     {
         type            calculated;
+        value           $internalField;
     }
 
     inlet
     {
         type            calculated;
+        value           $internalField;
     }
 
     frontAndBack
diff --git a/tutorials/combustion/fireFoam/les/smallPoolFire2D/0/O2 b/tutorials/combustion/fireFoam/les/smallPoolFire2D/0/O2
index ef57804773..12f53c31a9 100644
--- a/tutorials/combustion/fireFoam/les/smallPoolFire2D/0/O2
+++ b/tutorials/combustion/fireFoam/les/smallPoolFire2D/0/O2
@@ -21,14 +21,7 @@ internalField   uniform 0.23301;
 
 boundaryField
 {
-    outlet
-    {
-        type            inletOutlet;
-        inletValue      $internalField;
-        value           $internalField;
-    }
-
-    sides
+    "(outlet|sides)"
     {
         type            inletOutlet;
         inletValue      $internalField;
diff --git a/tutorials/combustion/fireFoam/les/smallPoolFire2D/0/T b/tutorials/combustion/fireFoam/les/smallPoolFire2D/0/T
index 8f4990b6ce..3b0173daa3 100644
--- a/tutorials/combustion/fireFoam/les/smallPoolFire2D/0/T
+++ b/tutorials/combustion/fireFoam/les/smallPoolFire2D/0/T
@@ -21,18 +21,11 @@ internalField   uniform 300;
 
 boundaryField
 {
-    outlet
+    "(outlet|sides)"
     {
         type            inletOutlet;
-        inletValue      uniform 300;
-        value           uniform 300;
-    }
-
-    sides
-    {
-        type            inletOutlet;
-        inletValue      uniform 300;
-        value           uniform 300;
+        inletValue      $internalField;
+        value           $internalField;
     }
 
     base
diff --git a/tutorials/combustion/fireFoam/les/smallPoolFire2D/0/U b/tutorials/combustion/fireFoam/les/smallPoolFire2D/0/U
index 9a1ad04efe..1b7249d44f 100644
--- a/tutorials/combustion/fireFoam/les/smallPoolFire2D/0/U
+++ b/tutorials/combustion/fireFoam/les/smallPoolFire2D/0/U
@@ -21,20 +21,12 @@ internalField   uniform (0 0 0);
 
 boundaryField
 {
-    outlet
+    "(outlet|sides)"
     {
 
-        type            inletOutlet;
-        inletValue      uniform (0 0 0);
-        value           uniform (0 0 0);
-
-    }
-
-    sides
-    {
         type            pressureInletOutletVelocity;
-        outletValue     uniform (0 0 0);
         value           uniform (0 0 0);
+
     }
 
     base
diff --git a/tutorials/combustion/fireFoam/les/smallPoolFire2D/0/Ydefault b/tutorials/combustion/fireFoam/les/smallPoolFire2D/0/Ydefault
index 74003f28f3..d73b8b17d4 100644
--- a/tutorials/combustion/fireFoam/les/smallPoolFire2D/0/Ydefault
+++ b/tutorials/combustion/fireFoam/les/smallPoolFire2D/0/Ydefault
@@ -21,31 +21,24 @@ internalField   uniform 0;
 
 boundaryField
 {
-    base
-    {
-        type            zeroGradient;
-    }
-
-    outlet
+    "(outlet|sides)"
     {
         type            inletOutlet;
         inletValue      $internalField;
         value           $internalField;
     }
 
+    base
+    {
+        type            zeroGradient;
+    }
+
     inlet
     {
         type            fixedValue;
         value           uniform 0;
     }
 
-    sides
-    {
-        type            inletOutlet;
-        inletValue      $internalField;
-        value           $internalField;
-    }
-
     frontAndBack
     {
         type            empty;
diff --git a/tutorials/combustion/fireFoam/les/smallPoolFire2D/0/alphat b/tutorials/combustion/fireFoam/les/smallPoolFire2D/0/alphat
index fe217e29ee..fe72f149ee 100644
--- a/tutorials/combustion/fireFoam/les/smallPoolFire2D/0/alphat
+++ b/tutorials/combustion/fireFoam/les/smallPoolFire2D/0/alphat
@@ -21,12 +21,7 @@ internalField   uniform 0;
 
 boundaryField
 {
-    outlet
-    {
-        type            zeroGradient;
-    }
-
-    sides
+    "(outlet|sides)"
     {
         type            zeroGradient;
     }
diff --git a/tutorials/combustion/fireFoam/les/smallPoolFire2D/0/k b/tutorials/combustion/fireFoam/les/smallPoolFire2D/0/k
index 377a3d0090..0bdbb389bb 100644
--- a/tutorials/combustion/fireFoam/les/smallPoolFire2D/0/k
+++ b/tutorials/combustion/fireFoam/les/smallPoolFire2D/0/k
@@ -21,11 +21,11 @@ internalField   uniform 1e-4;
 
 boundaryField
 {
-    outlet
+    "(outlet|sides)"
     {
         type            inletOutlet;
-        inletValue      uniform 1e-4;
-        value           uniform 1e-4;
+        inletValue      $internalField;
+        value           $internalField;
     }
 
     sides
@@ -37,14 +37,13 @@ boundaryField
 
     base
     {
-        type            fixedValue;
-        value           uniform 1e-4;
+        type            zeroGradient;
     }
 
     inlet
     {
         type            fixedValue;
-        value           uniform 1e-4;
+        value           $internalField;
     }
 
     frontAndBack
diff --git a/tutorials/combustion/fireFoam/les/smallPoolFire2D/0/nut b/tutorials/combustion/fireFoam/les/smallPoolFire2D/0/nut
index d22df48d1b..daead88155 100644
--- a/tutorials/combustion/fireFoam/les/smallPoolFire2D/0/nut
+++ b/tutorials/combustion/fireFoam/les/smallPoolFire2D/0/nut
@@ -21,12 +21,7 @@ internalField   uniform 0;
 
 boundaryField
 {
-    outlet
-    {
-        type            zeroGradient;
-    }
-
-    sides
+    "(outlet|sides)"
     {
         type            zeroGradient;
     }
diff --git a/tutorials/combustion/fireFoam/les/smallPoolFire2D/0/p b/tutorials/combustion/fireFoam/les/smallPoolFire2D/0/p
index 85a1f09dc4..b3a0399cf8 100644
--- a/tutorials/combustion/fireFoam/les/smallPoolFire2D/0/p
+++ b/tutorials/combustion/fireFoam/les/smallPoolFire2D/0/p
@@ -21,16 +21,10 @@ internalField   uniform 101325;
 
 boundaryField
 {
-    outlet
+    "(outlet|sides)"
     {
-        type            calculated;
-        value           $internalField;
-    }
-
-    sides
-    {
-        type            calculated;
-        value           $internalField;
+        type           calculated;
+        value          $internalField;
     }
 
     base
diff --git a/tutorials/combustion/fireFoam/les/smallPoolFire2D/0/p_rgh b/tutorials/combustion/fireFoam/les/smallPoolFire2D/0/p_rgh
index d941becc55..5868c5276f 100644
--- a/tutorials/combustion/fireFoam/les/smallPoolFire2D/0/p_rgh
+++ b/tutorials/combustion/fireFoam/les/smallPoolFire2D/0/p_rgh
@@ -21,13 +21,7 @@ internalField   uniform 101325;
 
 boundaryField
 {
-    outlet
-    {
-        type            fixedFluxPressure;
-        value           $internalField;
-    }
-
-    sides
+    "(outlet|sides)"
     {
         type            totalPressure;
         p0              $internalField;
diff --git a/tutorials/combustion/fireFoam/les/smallPoolFire2D/constant/polyMesh/boundary b/tutorials/combustion/fireFoam/les/smallPoolFire2D/constant/polyMesh/boundary
index 6a17bae1f0..c653eec7b0 100644
--- a/tutorials/combustion/fireFoam/les/smallPoolFire2D/constant/polyMesh/boundary
+++ b/tutorials/combustion/fireFoam/les/smallPoolFire2D/constant/polyMesh/boundary
@@ -8,7 +8,7 @@
 FoamFile
 {
     version     2.0;
-    format      ascii;
+    format      binary;
     class       polyBoundaryMesh;
     location    "constant/polyMesh";
     object      boundary;
diff --git a/tutorials/combustion/fireFoam/les/smallPoolFire2D/system/controlDict b/tutorials/combustion/fireFoam/les/smallPoolFire2D/system/controlDict
index 689f2a866c..8cc9eb187a 100644
--- a/tutorials/combustion/fireFoam/les/smallPoolFire2D/system/controlDict
+++ b/tutorials/combustion/fireFoam/les/smallPoolFire2D/system/controlDict
@@ -32,7 +32,7 @@ writeInterval   0.1;
 
 purgeWrite      0;
 
-writeFormat     ascii;
+writeFormat     binary;
 
 writePrecision  6;
 
diff --git a/tutorials/combustion/fireFoam/les/smallPoolFire2D/system/fvSchemes b/tutorials/combustion/fireFoam/les/smallPoolFire2D/system/fvSchemes
index 01608aaaa1..82cb86a511 100644
--- a/tutorials/combustion/fireFoam/les/smallPoolFire2D/system/fvSchemes
+++ b/tutorials/combustion/fireFoam/les/smallPoolFire2D/system/fvSchemes
@@ -28,9 +28,11 @@ gradSchemes
 divSchemes
 {
     default         none;
-    div(phi,U)      Gauss limitedLinear 1;
+
+    div(phi,U)      Gauss LUST grad(U);
+    div(phi,K)      Gauss linear;
     div(phi,k)      Gauss limitedLinear 1;
-    div(phi,Yi_h)  Gauss multivariateSelection
+    div(phi,Yi_h)   Gauss multivariateSelection
     {
         O2              limitedLinear01 1;
         CH4             limitedLinear01 1;
@@ -40,9 +42,6 @@ divSchemes
         h               limitedLinear 1;
     };
     div(((rho*nuEff)*dev2(T(grad(U))))) Gauss linear;
-    div(phi,omega)  Gauss limitedLinear 1;
-    div(phi,K)      Gauss limitedLinear 1;
-    div(U)          Gauss linear;
     div(Ji,Ii_h)    Gauss upwind;
 }
 
diff --git a/tutorials/combustion/fireFoam/les/smallPoolFire3D/0/CH4 b/tutorials/combustion/fireFoam/les/smallPoolFire3D/0/CH4
index bb36a422a7..1e50a10a9f 100644
--- a/tutorials/combustion/fireFoam/les/smallPoolFire3D/0/CH4
+++ b/tutorials/combustion/fireFoam/les/smallPoolFire3D/0/CH4
@@ -21,22 +21,18 @@ internalField   uniform 0;
 
 boundaryField
 {
-    outlet
+    "(outlet|sides)"
     {
         type            inletOutlet;
-        inletValue      uniform 0;
-        value           uniform 0;
-    }
-    sides
-    {
-        type            inletOutlet;
-        inletValue      uniform 0;
-        value           uniform 0;
+        inletValue      $internalField;
+        value           $internalField;
     }
+
     base
     {
         type            zeroGradient;
     }
+
     inlet
     {
         type            fixedValue;
diff --git a/tutorials/combustion/fireFoam/les/smallPoolFire3D/0/N2 b/tutorials/combustion/fireFoam/les/smallPoolFire3D/0/N2
index f44c142482..2313fa6d06 100644
--- a/tutorials/combustion/fireFoam/les/smallPoolFire3D/0/N2
+++ b/tutorials/combustion/fireFoam/les/smallPoolFire3D/0/N2
@@ -21,21 +21,22 @@ internalField   uniform 0.76699;
 
 boundaryField
 {
-    outlet
-    {
-        type            calculated;
-    }
-    sides
+    "(outlet|sides)"
     {
         type            calculated;
+        value           $internalField;
     }
+
     base
     {
         type            calculated;
+        value           $internalField;
     }
+
     inlet
     {
         type            calculated;
+        value           $internalField;
     }
 }
 
diff --git a/tutorials/combustion/fireFoam/les/smallPoolFire3D/0/O2 b/tutorials/combustion/fireFoam/les/smallPoolFire3D/0/O2
index a5dab92ad1..e73a7f5b4b 100644
--- a/tutorials/combustion/fireFoam/les/smallPoolFire3D/0/O2
+++ b/tutorials/combustion/fireFoam/les/smallPoolFire3D/0/O2
@@ -21,31 +21,23 @@ internalField   uniform 0.23301;
 
 boundaryField
 {
-    outlet
-    {
-        type            inletOutlet;
-        inletValue      $internalField;
-        value           $internalField;
-    }
-    sides
+    "(outlet|sides)"
     {
         type            inletOutlet;
         inletValue      $internalField;
         value           $internalField;
     }
+
     base
     {
         type            zeroGradient;
     }
+
     inlet
     {
         type            fixedValue;
         value           uniform 0;
     }
-    frontBack
-    {
-        type            empty;
-    }
 }
 
 
diff --git a/tutorials/combustion/fireFoam/les/smallPoolFire3D/0/T b/tutorials/combustion/fireFoam/les/smallPoolFire3D/0/T
index 7d8327178d..290a8b977b 100644
--- a/tutorials/combustion/fireFoam/les/smallPoolFire3D/0/T
+++ b/tutorials/combustion/fireFoam/les/smallPoolFire3D/0/T
@@ -21,28 +21,23 @@ internalField   uniform 300;
 
 boundaryField
 {
-    outlet
+    "(outlet|sides)"
     {
         type            inletOutlet;
-        inletValue      uniform 300;
-        value           uniform 300;
-    }
-    sides
-    {
-        type            inletOutlet;
-        inletValue      uniform 300;
-        value           uniform 300;
+        inletValue      $internalField;
+        value           $internalField;
     }
+
     base
     {
         type            zeroGradient;
     }
+
     inlet
     {
         type            fixedValue;
         value           uniform 300;
     }
-
 }
 
 
diff --git a/tutorials/combustion/fireFoam/les/smallPoolFire3D/0/U b/tutorials/combustion/fireFoam/les/smallPoolFire3D/0/U
index 6cf6336379..459ab9f086 100644
--- a/tutorials/combustion/fireFoam/les/smallPoolFire3D/0/U
+++ b/tutorials/combustion/fireFoam/les/smallPoolFire3D/0/U
@@ -21,31 +21,24 @@ internalField   uniform (0 0 0);
 
 boundaryField
 {
-    outlet
-    {
-
-        type            inletOutlet;
-        inletValue      uniform (0 0 0);
-        value           uniform (0 0 0);
-
-    }
-    sides
+    "(outlet|sides)"
     {
         type            pressureInletOutletVelocity;
         value           uniform (0 0 0);
         phi             phi;
     }
+
     base
     {
         type            fixedValue;
         value           uniform (0 0 0);
     }
+
     inlet
     {
         type            fixedValue;
         value           uniform (0 0.01 0);
     }
-
 }
 
 
diff --git a/tutorials/combustion/fireFoam/les/smallPoolFire3D/0/Ydefault b/tutorials/combustion/fireFoam/les/smallPoolFire3D/0/Ydefault
index afa47eaadb..7bb9c5e5b3 100644
--- a/tutorials/combustion/fireFoam/les/smallPoolFire3D/0/Ydefault
+++ b/tutorials/combustion/fireFoam/les/smallPoolFire3D/0/Ydefault
@@ -21,30 +21,23 @@ internalField   uniform 0;
 
 boundaryField
 {
-    base
-    {
-        type            zeroGradient;
-    }
-
-    outlet
+    "(outlet|sides)"
     {
         type            inletOutlet;
         inletValue      $internalField;
         value           $internalField;
     }
 
+    base
+    {
+        type            zeroGradient;
+    }
+
     inlet
     {
         type            fixedValue;
         value           uniform 0;
     }
-
-    sides
-    {
-        type            inletOutlet;
-        inletValue      $internalField;
-        value           $internalField;
-    }
 }
 
 
diff --git a/tutorials/combustion/fireFoam/les/smallPoolFire3D/0/alphat b/tutorials/combustion/fireFoam/les/smallPoolFire3D/0/alphat
index eee8d350d2..36c7e93bef 100644
--- a/tutorials/combustion/fireFoam/les/smallPoolFire3D/0/alphat
+++ b/tutorials/combustion/fireFoam/les/smallPoolFire3D/0/alphat
@@ -21,23 +21,20 @@ internalField   uniform 0;
 
 boundaryField
 {
-    outlet
-    {
-        type            zeroGradient;
-    }
-    sides
+    "(outlet|sides)"
     {
         type            zeroGradient;
     }
+
     base
     {
         type            zeroGradient;
     }
+
     inlet
     {
         type            zeroGradient;
     }
-
 }
 
 
diff --git a/tutorials/combustion/fireFoam/les/smallPoolFire3D/0/k b/tutorials/combustion/fireFoam/les/smallPoolFire3D/0/k
index 89387dba53..f7dfe368be 100644
--- a/tutorials/combustion/fireFoam/les/smallPoolFire3D/0/k
+++ b/tutorials/combustion/fireFoam/les/smallPoolFire3D/0/k
@@ -21,28 +21,23 @@ internalField   uniform 1e-4;
 
 boundaryField
 {
-    outlet
+    "(outlet|sides)"
     {
         type            inletOutlet;
-        inletValue      uniform 1e-4;
-        value           uniform 1e-4;
-    }
-    sides
-    {
-        type            inletOutlet;
-        inletValue      uniform 1e-4;
-        value           uniform 1e-4;
+        inletValue      $internalField;
+        value           $internalField;
     }
+
     base
     {
         type            zeroGradient;
     }
+
     inlet
     {
         type            fixedValue;
-        value           uniform 1e-4;
+        value           $internalField;
     }
-
 }
 
 
diff --git a/tutorials/combustion/fireFoam/les/smallPoolFire3D/0/nut b/tutorials/combustion/fireFoam/les/smallPoolFire3D/0/nut
index f626af5668..66da1bd802 100644
--- a/tutorials/combustion/fireFoam/les/smallPoolFire3D/0/nut
+++ b/tutorials/combustion/fireFoam/les/smallPoolFire3D/0/nut
@@ -21,18 +21,16 @@ internalField   uniform 0;
 
 boundaryField
 {
-    outlet
-    {
-        type            zeroGradient;
-    }
-    sides
+    "(outlet|sides)"
     {
         type            zeroGradient;
     }
+
     base
     {
         type            zeroGradient;
     }
+
     inlet
     {
         type            zeroGradient;
diff --git a/tutorials/combustion/fireFoam/les/smallPoolFire3D/0/p b/tutorials/combustion/fireFoam/les/smallPoolFire3D/0/p
index f403fa62a9..193f3414dd 100644
--- a/tutorials/combustion/fireFoam/les/smallPoolFire3D/0/p
+++ b/tutorials/combustion/fireFoam/les/smallPoolFire3D/0/p
@@ -21,22 +21,18 @@ internalField   uniform 101325;
 
 boundaryField
 {
-    outlet
+    "(outlet|sides)"
     {
         type           calculated;
         value          $internalField;
     }
 
-    sides
-    {
-        type           calculated;
-        value          $internalField;
-    }
     base
     {
         type           calculated;
         value          $internalField;
     }
+
     inlet
     {
         type           calculated;
diff --git a/tutorials/combustion/fireFoam/les/smallPoolFire3D/0/p_rgh b/tutorials/combustion/fireFoam/les/smallPoolFire3D/0/p_rgh
index 420c10de47..15a149ba61 100644
--- a/tutorials/combustion/fireFoam/les/smallPoolFire3D/0/p_rgh
+++ b/tutorials/combustion/fireFoam/les/smallPoolFire3D/0/p_rgh
@@ -21,12 +21,7 @@ internalField   uniform 101325;
 
 boundaryField
 {
-    outlet
-    {
-        type            fixedFluxPressure;
-        value           $internalField;
-    }
-    sides
+    "(outlet|sides)"
     {
         type            totalPressure;
         p0              $internalField;
@@ -34,14 +29,16 @@ boundaryField
         phi             phi;
         rho             rho;
         psi             none;
-        gamma           0;
+        gamma           1;
         value           $internalField;
     }
+
     base
     {
         type            fixedFluxPressure;
         value           $internalField;
     }
+
     inlet
     {
         type            fixedFluxPressure;
diff --git a/tutorials/combustion/fireFoam/les/smallPoolFire3D/system/controlDict b/tutorials/combustion/fireFoam/les/smallPoolFire3D/system/controlDict
index bae6296f20..46fecf3034 100644
--- a/tutorials/combustion/fireFoam/les/smallPoolFire3D/system/controlDict
+++ b/tutorials/combustion/fireFoam/les/smallPoolFire3D/system/controlDict
@@ -32,7 +32,7 @@ writeInterval   0.1;
 
 purgeWrite      0;
 
-writeFormat     ascii;
+writeFormat     binary;
 
 writePrecision  6;
 
diff --git a/tutorials/combustion/fireFoam/les/smallPoolFire3D/system/fvSchemes b/tutorials/combustion/fireFoam/les/smallPoolFire3D/system/fvSchemes
index a713ce9d93..82cb86a511 100644
--- a/tutorials/combustion/fireFoam/les/smallPoolFire3D/system/fvSchemes
+++ b/tutorials/combustion/fireFoam/les/smallPoolFire3D/system/fvSchemes
@@ -27,11 +27,12 @@ gradSchemes
 
 divSchemes
 {
-    default        none;
-    div(phi,U)      Gauss linear;
+    default         none;
+
+    div(phi,U)      Gauss LUST grad(U);
     div(phi,K)      Gauss linear;
     div(phi,k)      Gauss limitedLinear 1;
-    div(phi,Yi_h) Gauss multivariateSelection
+    div(phi,Yi_h)   Gauss multivariateSelection
     {
         O2              limitedLinear01 1;
         CH4             limitedLinear01 1;