diff --git a/tutorials/incompressible/simpleFoam/turbineSiting/0/epsilon b/tutorials/incompressible/simpleFoam/turbineSiting/0/epsilon
index 8a3f657084..cbbcc3aebf 100644
--- a/tutorials/incompressible/simpleFoam/turbineSiting/0/epsilon
+++ b/tutorials/incompressible/simpleFoam/turbineSiting/0/epsilon
@@ -40,7 +40,8 @@ boundaryField
     inlet
     {
         type            atmBoundaryLayerInletEpsilon;
-        Ustar           $Ustar;
+        Uref            $Uref;
+        Href            $Href;
         z               $zDirection;
         z0              $z0;
         value           $internalField;
diff --git a/tutorials/incompressible/simpleFoam/turbineSiting/0/include/ABLConditions b/tutorials/incompressible/simpleFoam/turbineSiting/0/include/ABLConditions
index be005f46a0..b63b50f417 100644
--- a/tutorials/incompressible/simpleFoam/turbineSiting/0/include/ABLConditions
+++ b/tutorials/incompressible/simpleFoam/turbineSiting/0/include/ABLConditions
@@ -6,10 +6,9 @@
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 
-Ustar                0.82;
 Uref                 10.0;
 Href                 20;
-z0                   0.1;
+z0                   uniform 0.1;
 turbulentKE          1.3;
 windDirection        (1 0 0);
 zDirection           (0 0 1);
diff --git a/tutorials/incompressible/simpleFoam/turbineSiting/0/nut b/tutorials/incompressible/simpleFoam/turbineSiting/0/nut
index 5e17706e0a..be1471daf3 100644
--- a/tutorials/incompressible/simpleFoam/turbineSiting/0/nut
+++ b/tutorials/incompressible/simpleFoam/turbineSiting/0/nut
@@ -36,9 +36,8 @@ boundaryField
 
     "terrain_.*"
     {
-        type            nutkRoughWallFunction;
-        Ks              uniform 0.2; //Ks = 20 Z0
-        Cs              uniform 0.5;
+        type            nutkAtmRoughWallFunction;
+        z0              $Z0;
         value           uniform 0.0;
     }
 
diff --git a/tutorials/incompressible/simpleFoam/turbineSiting/constant/polyMesh/boundary b/tutorials/incompressible/simpleFoam/turbineSiting/constant/polyMesh/boundary
index 7abdd81f4f..7b72e85f59 100644
--- a/tutorials/incompressible/simpleFoam/turbineSiting/constant/polyMesh/boundary
+++ b/tutorials/incompressible/simpleFoam/turbineSiting/constant/polyMesh/boundary
@@ -15,43 +15,37 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-6
+5
 (
     outlet
     {
         type            patch;
-        nFaces          922;
-        startFace       364825;
+        nFaces          600;
+        startFace       51900;
     }
     sides
     {
         type            patch;
-        nFaces          1834;
-        startFace       365747;
+        nFaces          1200;
+        startFace       52500;
     }
     inlet
     {
         type            patch;
-        nFaces          923;
-        startFace       367581;
+        nFaces          600;
+        startFace       53700;
     }
     ground
     {
         type            wall;
-        nFaces          0;
-        startFace       368504;
+        nFaces          900;
+        startFace       54300;
     }
     top
     {
         type            patch;
         nFaces          900;
-        startFace       368504;
-    }
-    terrain_patch0
-    {
-        type            wall;
-        nFaces          16037;
-        startFace       369404;
+        startFace       55200;
     }
 )
 
diff --git a/tutorials/incompressible/simpleFoam/turbineSiting/constant/sourcesProperties b/tutorials/incompressible/simpleFoam/turbineSiting/constant/sourcesProperties
index 00249342e4..a57b5a3b7b 100644
--- a/tutorials/incompressible/simpleFoam/turbineSiting/constant/sourcesProperties
+++ b/tutorials/incompressible/simpleFoam/turbineSiting/constant/sourcesProperties
@@ -27,10 +27,11 @@ disk1
     actuationDiskSourceCoeffs
     {
         fieldNames  (U);
-        diskDir     (-1 0 0); // orientation of the disk
-        Cp          0.53;     // Cp
-        Ct          0.58;     // Ct
-        diskArea    40;       // disk area
+        diskDir     (-1 0 0);   // orientation of the disk
+        Cp          0.386;      // Cp
+        Ct          0.58;       // Ct
+        diskArea    40;         // disk area
+        upstreamPoint (581849 4785810 1065);
     }
 }
 
@@ -50,6 +51,7 @@ disk2
         Cp          0.53;
         Ct          0.58;
         diskArea    40;
+        upstreamPoint (581753 4785663 1070);
     }
 }
 
diff --git a/tutorials/incompressible/simpleFoam/turbineSiting/system/changeDictionaryDict b/tutorials/incompressible/simpleFoam/turbineSiting/system/changeDictionaryDict
index 5ad20a759e..e90a3425ce 100644
--- a/tutorials/incompressible/simpleFoam/turbineSiting/system/changeDictionaryDict
+++ b/tutorials/incompressible/simpleFoam/turbineSiting/system/changeDictionaryDict
@@ -15,6 +15,7 @@ FoamFile
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #include        "$FOAM_CASE/0/include/initialConditions"
+#include        "$FOAM_CASE/0/include/ABLConditions"
 
 dictionaryReplacement
 {
@@ -99,12 +100,12 @@ dictionaryReplacement
             inlet
             {
                 type            atmBoundaryLayerInletVelocity;
-                Uref            10.0;
-                Href            20;
-                n               (1 0 0);
-                z               (0 0 1);
-                z0              0.1;
-                zGround         935.0;
+                Uref            $Uref;
+                Href            $Href;
+                n               $windDirection;
+                z               $zDirection;
+                z0              $z0;
+                zGround         $zGround;
                 value           uniform $flowVelocity;
             }
             "terrain_.*"
@@ -141,9 +142,8 @@ dictionaryReplacement
             }
             "terrain_.*"
             {
-                type            nutkRoughWallFunction;
-                Ks              uniform 0.2; //Ks = 20 Z0
-                Cs              uniform 0.5;
+                type            nutkAtmRoughWallFunction;
+                z0              $z0;
                 value           uniform 0.0;
             }
             ground
@@ -170,11 +170,12 @@ dictionaryReplacement
             inlet
             {
                 type            atmBoundaryLayerInletEpsilon;
-                Ustar           0.82;
-                z               (0 0 1);
-                z0              0.1;
+                z               $zDirection;
+                z0              $z0;
+                zGround         $zGround;
+                Uref            $Uref;
+                Href            $Href;
                 value           uniform $turbulentEpsilon;
-                zGround         935.0;
             }
             "terrain_.*"
             {