diff --git a/tutorials/multiphase/cavitatingFoam/throttle/0/k b/tutorials/multiphase/cavitatingFoam/throttle/0/k
index 835c3a999..dfc98ecbf 100644
--- a/tutorials/multiphase/cavitatingFoam/throttle/0/k
+++ b/tutorials/multiphase/cavitatingFoam/throttle/0/k
@@ -1,8 +1,8 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
-| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  1.5                                   |
-|   \\  /    A nd           | Web:      http://www.OpenFOAM.org               |
+| \\      /  F ield         | OpenFOAM Extend Project: Open source CFD        |
+|  \\    /   O peration     | Version:  1.6-ext                               |
+|   \\  /    A nd           | Web:      www.extend-project.de                 |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
@@ -10,11 +10,12 @@ FoamFile
     version     2.0;
     format      ascii;
     class       volScalarField;
+    location    "0";
     object      k;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-dimensions      [0 2 -2 0 0];
+dimensions      [0 2 -2 0 0 0 0];
 
 internalField   uniform 10.0;
 
@@ -34,7 +35,8 @@ boundaryField
 
     walls
     {
-        type            zeroGradient;
+        type            kqRWallFunction;
+        value           uniform 10.0;
     }
 
     frontBack
diff --git a/tutorials/multiphase/cavitatingFoam/throttle/0/nut b/tutorials/multiphase/cavitatingFoam/throttle/0/nut
new file mode 100644
index 000000000..05530161f
--- /dev/null
+++ b/tutorials/multiphase/cavitatingFoam/throttle/0/nut
@@ -0,0 +1,51 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM Extend Project: Open source CFD        |
+|  \\    /   O peration     | Version:  1.6-ext                               |
+|   \\  /    A nd           | Web:      www.extend-project.de                 |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       volScalarField;
+    location    "0";
+    object      nut;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions      [0 2 -1 0 0 0 0];
+
+internalField   uniform 0;
+
+boundaryField
+{
+    inlet
+    {
+        type            calculated;
+        value           uniform 0;
+    }
+
+    outlet
+    {
+        type            calculated;
+        value           uniform 0;
+    }
+
+    walls
+    {
+        type            nutWallFunction;
+        Cmu             0.09;
+        kappa           0.41;
+        E               9.8;
+        value           uniform 0;
+    }
+
+    frontBack
+    {
+        type            empty;
+    }
+}
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/cavitatingFoam/throttle/0/omega b/tutorials/multiphase/cavitatingFoam/throttle/0/omega
index 330a29d8c..1890f4070 100644
--- a/tutorials/multiphase/cavitatingFoam/throttle/0/omega
+++ b/tutorials/multiphase/cavitatingFoam/throttle/0/omega
@@ -1,8 +1,8 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
-| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  1.5                                   |
-|   \\  /    A nd           | Web:      http://www.OpenFOAM.org               |
+| \\      /  F ield         | OpenFOAM Extend Project: Open source CFD        |
+|  \\    /   O peration     | Version:  1.6-ext                               |
+|   \\  /    A nd           | Web:      www.extend-project.de                 |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
@@ -10,11 +10,12 @@ FoamFile
     version     2.0;
     format      ascii;
     class       volScalarField;
+    location    "0";
     object      omega;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-dimensions      [0 0 -1 0 0];
+dimensions      [0 0 -1 0 0 0 0];
 
 internalField   uniform 77200;
 
@@ -23,7 +24,7 @@ boundaryField
     inlet
     {
         type            turbulentMixingLengthFrequencyInlet;
-        mixingLength    0.5e-03;
+        mixingLength    0.0005;
         k               k;
         value           uniform 77200;
     }
@@ -35,7 +36,12 @@ boundaryField
 
     walls
     {
-        type            zeroGradient;
+        type            omegaWallFunction;
+        Cmu             0.09;
+        kappa           0.41;
+        E               9.8;
+        beta1           0.075;
+        value           uniform 77200;
     }
 
     frontBack
diff --git a/tutorials/multiphase/cavitatingFoam/throttle/Allrun b/tutorials/multiphase/cavitatingFoam/throttle/Allrun
index 972d1f37c..288660de7 100755
--- a/tutorials/multiphase/cavitatingFoam/throttle/Allrun
+++ b/tutorials/multiphase/cavitatingFoam/throttle/Allrun
@@ -3,7 +3,7 @@
 # Source tutorial run functions
 . $WM_PROJECT_DIR/bin/tools/RunFunctions
 
-application="rasCavitatingFoam"
+application="cavitatingFoam"
 
 refineMeshByCellSet()
 {
diff --git a/tutorials/multiphase/cavitatingFoam/throttle/constant/turbulenceProperties b/tutorials/multiphase/cavitatingFoam/throttle/constant/turbulenceProperties
new file mode 100644
index 000000000..0474fdb0e
--- /dev/null
+++ b/tutorials/multiphase/cavitatingFoam/throttle/constant/turbulenceProperties
@@ -0,0 +1,19 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  1.5                                   |
+|   \\  /    A nd           | Web:      http://www.OpenFOAM.org               |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    object      turbulenceProperties;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+simulationType RASModel;
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/cavitatingFoam/throttle/system/fvSolution b/tutorials/multiphase/cavitatingFoam/throttle/system/fvSolution
index f6bad1ada..c1239ed97 100644
--- a/tutorials/multiphase/cavitatingFoam/throttle/system/fvSolution
+++ b/tutorials/multiphase/cavitatingFoam/throttle/system/fvSolution
@@ -16,36 +16,58 @@ FoamFile
 
 solvers
 {
-    omega PBiCG
+    omega
     {
+        solver           PBiCG;
         preconditioner   DILU;
         tolerance        1e-08;
         relTol           0;
     };
 
-    k PBiCG
+    k
     {
+        solver           PBiCG;
         preconditioner   DILU;
         tolerance        1e-08;
         relTol           0;
     };
 
-    rho PBiCG
+    rho
     {
+        solver           PBiCG;
         preconditioner   DILU;
         tolerance        1e-08;
         relTol           0;
     };
 
-    U PBiCG
+    U
     {
+        solver           PBiCG;
         preconditioner   DILU;
         tolerance        1e-08;
         relTol           0;
     };
 
-    p GAMG
+    p
     {
+        solver           GAMG;
+        tolerance        1e-8;
+        relTol           0;
+
+        smoother         GaussSeidel;
+        nPreSweeps       0;
+        nPostSweeps      2;
+
+        cacheAgglomeration true;
+
+        nCellsInCoarsestLevel 10;
+        agglomerator     faceAreaPair;
+        mergeLevels      1;
+    };
+
+    pFinal
+    {
+        solver           GAMG;
         tolerance        1e-8;
         relTol           0;