diff --git a/tutorials/incompressible/simpleFoam/motorBike/0.org/U b/tutorials/incompressible/simpleFoam/motorBike/0.org/U
index 6350971218..fee3ec88b8 100644
--- a/tutorials/incompressible/simpleFoam/motorBike/0.org/U
+++ b/tutorials/incompressible/simpleFoam/motorBike/0.org/U
@@ -41,7 +41,7 @@ boundaryField
         value           $internalField;
     }
 
-    "motorBike_.*"
+    motorBikeGroup
     {
         type            fixedValue;
         value           uniform (0 0 0);
diff --git a/tutorials/incompressible/simpleFoam/motorBike/0.org/k b/tutorials/incompressible/simpleFoam/motorBike/0.org/k
index 834d2ad52c..301f8b579c 100644
--- a/tutorials/incompressible/simpleFoam/motorBike/0.org/k
+++ b/tutorials/incompressible/simpleFoam/motorBike/0.org/k
@@ -41,7 +41,7 @@ boundaryField
         value           $internalField;
     }
 
-    "motorBike_.*"
+    motorBikeGroup
     {
         type            kqRWallFunction;
         value           $internalField;
diff --git a/tutorials/incompressible/simpleFoam/motorBike/0.org/nut b/tutorials/incompressible/simpleFoam/motorBike/0.org/nut
index 999d0b331e..c940f6b2d6 100644
--- a/tutorials/incompressible/simpleFoam/motorBike/0.org/nut
+++ b/tutorials/incompressible/simpleFoam/motorBike/0.org/nut
@@ -54,7 +54,7 @@ boundaryField
         value           uniform 0;
     }
 
-    "motorBike_.*"
+    motorBikeGroup
     {
         type            nutkWallFunction;
         value           uniform 0;
diff --git a/tutorials/incompressible/simpleFoam/motorBike/0.org/omega b/tutorials/incompressible/simpleFoam/motorBike/0.org/omega
index 5362d6c44e..7eff6c7355 100644
--- a/tutorials/incompressible/simpleFoam/motorBike/0.org/omega
+++ b/tutorials/incompressible/simpleFoam/motorBike/0.org/omega
@@ -40,7 +40,7 @@ boundaryField
         value           $internalField;
     }
 
-    "motorBike_.*"
+    motorBikeGroup
     {
         type            omegaWallFunction;
         value           $internalField;
diff --git a/tutorials/incompressible/simpleFoam/motorBike/0.org/p b/tutorials/incompressible/simpleFoam/motorBike/0.org/p
index e6eb255c41..419e1a85d8 100644
--- a/tutorials/incompressible/simpleFoam/motorBike/0.org/p
+++ b/tutorials/incompressible/simpleFoam/motorBike/0.org/p
@@ -41,7 +41,7 @@ boundaryField
         type            zeroGradient;
     }
 
-    "motorBike_.*"
+    motorBikeGroup
     {
         type            zeroGradient;
     }
diff --git a/tutorials/incompressible/simpleFoam/motorBike/Allclean b/tutorials/incompressible/simpleFoam/motorBike/Allclean
index af2c672ef8..25434c9d02 100755
--- a/tutorials/incompressible/simpleFoam/motorBike/Allclean
+++ b/tutorials/incompressible/simpleFoam/motorBike/Allclean
@@ -3,8 +3,10 @@
 # Source tutorial clean functions
 . $WM_PROJECT_DIR/bin/tools/CleanFunctions
 
-# remove surface
+# remove surface and features
 \rm -f constant/triSurface/motorBike.obj.gz
+\rm -rf constant/extendedFeatureEdgeMesh/
+\rm -f constant/triSurface/motorBike.eMesh
 
 rm -rf 0 > /dev/null 2>&1
 
diff --git a/tutorials/incompressible/simpleFoam/motorBike/constant/polyMesh/boundary b/tutorials/incompressible/simpleFoam/motorBike/constant/polyMesh/boundary
deleted file mode 100644
index ce1bcc0d3a..0000000000
--- a/tutorials/incompressible/simpleFoam/motorBike/constant/polyMesh/boundary
+++ /dev/null
@@ -1,52 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       polyBoundaryMesh;
-    location    "constant/polyMesh";
-    object      boundary;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-5
-(
-    frontAndBack
-    {
-        type            patch;
-        nFaces          320;
-        startFace       3456;
-    }
-    inlet
-    {
-        type            patch;
-        nFaces          64;
-        startFace       3776;
-    }
-    outlet
-    {
-        type            patch;
-        nFaces          64;
-        startFace       3840;
-    }
-    lowerWall
-    {
-        type            wall;
-        nFaces          160;
-        startFace       3904;
-    }
-    upperWall
-    {
-        type            patch;
-        nFaces          160;
-        startFace       4064;
-    }
-)
-
-// ************************************************************************* //
diff --git a/tutorials/incompressible/simpleFoam/motorBike/system/forceCoeffs b/tutorials/incompressible/simpleFoam/motorBike/system/forceCoeffs
index e4977a21d6..3012c35b32 100644
--- a/tutorials/incompressible/simpleFoam/motorBike/system/forceCoeffs
+++ b/tutorials/incompressible/simpleFoam/motorBike/system/forceCoeffs
@@ -12,12 +12,11 @@ forceCoeffs1
 
     functionObjectLibs ( "libforces.so" );
 
-    outputControl   timeStep;
-    outputInterval  1;
+    outputControl   outputTime;
 
     log         yes;
 
-    patches     ( "motorBike.*" );
+    patches     ( motorBikeGroup );
     pName       p;
     UName       U;
     rhoName     rhoInf;      // Indicates incompressible
@@ -31,6 +30,7 @@ forceCoeffs1
     lRef        1.42;        // Wheelbase length
     Aref        0.75;        // Estimated
 
+/* - Uncomment to have forceCoeffs calculated in 20 bins
     binData
     {
         nBin        20;          // output data into 20 bins
@@ -38,6 +38,7 @@ forceCoeffs1
         format      gnuplot;
         cumulative  yes;
     }
+*/
 }
 
 
diff --git a/tutorials/incompressible/simpleFoam/motorBike/system/fvSchemes b/tutorials/incompressible/simpleFoam/motorBike/system/fvSchemes
index 36a6021c97..c0f1506a7c 100644
--- a/tutorials/incompressible/simpleFoam/motorBike/system/fvSchemes
+++ b/tutorials/incompressible/simpleFoam/motorBike/system/fvSchemes
@@ -22,6 +22,7 @@ ddtSchemes
 gradSchemes
 {
     default         Gauss linear;
+    grad(U)         cellLimited Gauss linear 1;
 }
 
 divSchemes
diff --git a/tutorials/incompressible/simpleFoam/motorBike/system/fvSolution b/tutorials/incompressible/simpleFoam/motorBike/system/fvSolution
index 5037a3c14f..55c9820427 100644
--- a/tutorials/incompressible/simpleFoam/motorBike/system/fvSolution
+++ b/tutorials/incompressible/simpleFoam/motorBike/system/fvSolution
@@ -20,7 +20,7 @@ solvers
     {
         solver           GAMG;
         tolerance        1e-7;
-        relTol           0.1;
+        relTol           0.01;
         smoother         GaussSeidel;
         nPreSweeps       0;
         nPostSweeps      2;
diff --git a/tutorials/incompressible/simpleFoam/motorBike/system/snappyHexMeshDict b/tutorials/incompressible/simpleFoam/motorBike/system/snappyHexMeshDict
index 17d0e6feb5..00cc7b66ef 100644
--- a/tutorials/incompressible/simpleFoam/motorBike/system/snappyHexMeshDict
+++ b/tutorials/incompressible/simpleFoam/motorBike/system/snappyHexMeshDict
@@ -92,7 +92,7 @@ castellatedMeshControls
     (
         {
             file "motorBike.eMesh";
-            level 0;
+            level 6;
         }
     );
 
@@ -119,7 +119,7 @@ castellatedMeshControls
             patchInfo
             {
                 type wall;
-                inGroups (motorBike);
+                inGroups (motorBikeGroup);
             }
         }
     }
@@ -180,10 +180,10 @@ snapControls
     //- Relative distance for points to be attracted by surface feature point
     //  or edge. True distance is this factor times local
     //  maximum edge length.
-    tolerance 4.0;
+    tolerance 2.0;
 
     //- Number of mesh displacement relaxation iterations.
-    nSolveIter 0;
+    nSolveIter 30;
 
     //- Maximum number of snapping relaxation iterations. Should stop
     //  before upon reaching a correct mesh.
@@ -193,14 +193,14 @@ snapControls
 
         //- Number of feature edge snapping iterations.
         //  Leave out altogether to disable.
-        nFeatureSnapIter 0;
+        nFeatureSnapIter 10;
 
         //- Detect (geometric only) features by sampling the surface
         //  (default=false).
         implicitFeatureSnap false;
 
         //- Use castellatedMeshControls::features (default = true)
-        explicitFeatureSnap false;
+        explicitFeatureSnap true;
 
         //- Detect points on multiple surfaces (only for explicitFeatureSnap)
         multiRegionFeatureSnap false;
diff --git a/tutorials/incompressible/simpleFoam/motorBike/system/wallBoundedStreamLines b/tutorials/incompressible/simpleFoam/motorBike/system/wallBoundedStreamLines
index e3e050e2b9..c071607c9a 100644
--- a/tutorials/incompressible/simpleFoam/motorBike/system/wallBoundedStreamLines
+++ b/tutorials/incompressible/simpleFoam/motorBike/system/wallBoundedStreamLines
@@ -16,7 +16,6 @@ near
 
     // Output every
     outputControl   outputTime;
-    //outputInterval  1;
 
     // Fields to be sampled. Per field original name and mapped field to
     // create.
@@ -27,7 +26,7 @@ near
     );
 
     // Patches/groups to sample (regular expressions)
-    patches (motorBike);
+    patches (motorBikeGroup);
 
     // Distance to sample
     distance 0.001;
@@ -42,7 +41,6 @@ wallBoundedStreamLines
 
     // Output every
     outputControl   outputTime;
-    // outputInterval 10;
 
     setFormat       vtk; //gnuplot; //xmgr; //raw; //jplot;
 
@@ -87,7 +85,7 @@ wallBoundedStreamLines
     patchSeedCoeffs
     {
         type        patchSeed;
-        patches     (motorBike);
+        patches     (motorBikeGroup);
         axis        x;  //distance;
         maxPoints   20000;
     }