diff --git a/etc/caseDicts/annotated/surfaceFeaturesDict b/etc/caseDicts/annotated/surfaceFeaturesDict
index 742fb064bf..e1263f3613 100644
--- a/etc/caseDicts/annotated/surfaceFeaturesDict
+++ b/etc/caseDicts/annotated/surfaceFeaturesDict
@@ -68,6 +68,7 @@ surface2
         // (minPt)(maxPt)
         // Keep edges inside the box:
         insideBox           (0 0 0)(1 1 1);
+
         // Keep edges outside the box:
         outsideBox          (0 0 0)(1 1 1);
 
diff --git a/tutorials/mesh/snappyHexMesh/pipe/Allclean b/tutorials/mesh/snappyHexMesh/pipe/Allclean
index b94df241de..4646b7d777 100755
--- a/tutorials/mesh/snappyHexMesh/pipe/Allclean
+++ b/tutorials/mesh/snappyHexMesh/pipe/Allclean
@@ -5,9 +5,9 @@ cd ${0%/*} || exit 1    # Run from this directory
 . $WM_PROJECT_DIR/bin/tools/CleanFunctions
 
 # Remove surface
-rm -f constant/triSurface/* > /dev/null 2>&1
+rm -rf constant/triSurface
 
-rm -rf constant/extendedFeatureEdgeMesh > /dev/null 2>&1
+rm -rf constant/extendedFeatureEdgeMesh
 
 cleanCase
 
diff --git a/tutorials/mesh/snappyHexMesh/pipe/Allrun b/tutorials/mesh/snappyHexMesh/pipe/Allrun
index 89d36ce206..98f7090e10 100755
--- a/tutorials/mesh/snappyHexMesh/pipe/Allrun
+++ b/tutorials/mesh/snappyHexMesh/pipe/Allrun
@@ -5,7 +5,8 @@ cd ${0%/*} || exit 1    # Run from this directory
 . $WM_PROJECT_DIR/bin/tools/RunFunctions
 
 # Copy pipe surface from resources directory
-cp $FOAM_TUTORIALS/resources/geometry/pipe.obj.gz constant/triSurface/
+mkdir -p constant/triSurface
+cp $FOAM_TUTORIALS/resources/geometry/pipe*.obj.gz constant/triSurface/
 
 runApplication surfaceFeatures
 runApplication blockMesh
diff --git a/tutorials/mesh/snappyHexMesh/pipe/system/blockMeshDict b/tutorials/mesh/snappyHexMesh/pipe/system/blockMeshDict
index f971e92c6c..f118f7eb0a 100644
--- a/tutorials/mesh/snappyHexMesh/pipe/system/blockMeshDict
+++ b/tutorials/mesh/snappyHexMesh/pipe/system/blockMeshDict
@@ -14,15 +14,15 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-radius      25.2;
-radiusNeg  -25.2;
+radius      25.5;
+radiusNeg  -25.5;
 box         5;
 boxNeg     -5;
-zMax        70;
-zMin       -50;
+zMax        84;
+zMin       -60;
 
 nR          7;
-nZ          20;
+nZ          24;
 
 verbose no;
 
diff --git a/tutorials/mesh/snappyHexMesh/pipe/system/snappyHexMeshDict b/tutorials/mesh/snappyHexMesh/pipe/system/snappyHexMeshDict
index 9f9388bcad..1717339138 100644
--- a/tutorials/mesh/snappyHexMesh/pipe/system/snappyHexMeshDict
+++ b/tutorials/mesh/snappyHexMesh/pipe/system/snappyHexMeshDict
@@ -27,6 +27,12 @@ geometry
         type closedTriSurfaceMesh;
         file "pipe.obj";
     }
+
+    pipeWall
+    {
+        type closedTriSurfaceMesh;
+        file "pipeWall.obj";
+    }
 };
 
 castellatedMeshControls
@@ -53,7 +59,7 @@ castellatedMeshControls
 
     refinementRegions
     {
-        pipe
+        pipeWall
         {
             mode span;
             levels ((1000 2));
diff --git a/tutorials/mesh/snappyHexMesh/pipe/system/surfaceFeaturesDict b/tutorials/mesh/snappyHexMesh/pipe/system/surfaceFeaturesDict
index 153bc8b8be..573ae26684 100644
--- a/tutorials/mesh/snappyHexMesh/pipe/system/surfaceFeaturesDict
+++ b/tutorials/mesh/snappyHexMesh/pipe/system/surfaceFeaturesDict
@@ -14,23 +14,43 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-surfaces
-(
-    "pipe.obj"
-);
+pipe
+{
+    surfaces
+    (
+        "pipe.obj"
+    );
 
-// Mark edges whose adjacent surface normals are at an angle less
-// than includedAngle as features
-// - 0  : selects no edges
-// - 180: selects all edges
-includedAngle   150;
+    // Mark edges whose adjacent surface normals are at an angle less
+    // than includedAngle as features
+    // - 0  : selects no edges
+    // - 180: selects all edges
+    includedAngle           150;
 
-// Do not mark region edges
-geometricTestOnly       yes;
+    // Do not mark region edges
+    geometricTestOnly       yes;
 
-// Output the closeness of surface points to other surface elements.
-pointCloseness          yes;
+    writeObj                yes;
+    verboseObj              yes;
+}
 
-writeVTK                yes;
+pipeWall
+{
+    surfaces
+    (
+        "pipeWall.obj"
+    );
+
+    // Mark edges whose adjacent surface normals are at an angle less
+    // than includedAngle as features
+    // - 0  : selects no edges
+    // - 180: selects all edges
+    includedAngle           150;
+
+    // Output the closeness of surface points to other surface elements.
+    pointCloseness          yes;
+
+    writeVTK                yes;
+}
 
 // ************************************************************************* //
diff --git a/tutorials/resources/geometry/pipe.obj.gz b/tutorials/resources/geometry/pipe.obj.gz
index 551a790a3b..37a1aef7d1 100644
Binary files a/tutorials/resources/geometry/pipe.obj.gz and b/tutorials/resources/geometry/pipe.obj.gz differ
diff --git a/tutorials/resources/geometry/pipeWall.obj.gz b/tutorials/resources/geometry/pipeWall.obj.gz
new file mode 100644
index 0000000000..7877b88509
Binary files /dev/null and b/tutorials/resources/geometry/pipeWall.obj.gz differ