diff --git a/tutorials/incompressible/pimpleFoam/TJunction/0/p b/tutorials/incompressible/pimpleFoam/TJunction/0/p
index 138a32a77b..d2e1eefa22 100644
--- a/tutorials/incompressible/pimpleFoam/TJunction/0/p
+++ b/tutorials/incompressible/pimpleFoam/TJunction/0/p
@@ -16,17 +16,17 @@ FoamFile
 
 dimensions      [0 2 -2 0 0 0 0];
 
-internalField   uniform 100000;
+internalField   uniform 0;
 
 boundaryField
 {
     inlet      
     {
         //type            totalPressure;
-        //p0              uniform 100040;
+        //p0              uniform 40;
 
         type            timeVaryingTotalPressure;
-        p0              100040; // only used for restarts
+        p0              40; // only used for restarts
         outOfBounds     clamp;
         fileName        "$FOAM_CASE/constant/p0vsTime";
 
@@ -35,19 +35,19 @@ boundaryField
         rho             none;
         psi             none;
         gamma           1;
-        value           uniform 100040;
+        value           uniform 40;
     }
 
     outlet1     
     {
         type            fixedValue;
-        value           uniform 100010;
+        value           uniform 10;
     }
 
     outlet2    
     {
         type            fixedValue;
-        value           uniform 100000;
+        value           uniform 0;
     }
 
     defaultFaces
diff --git a/tutorials/incompressible/pimpleFoam/TJunction/constant/p0vsTime b/tutorials/incompressible/pimpleFoam/TJunction/constant/p0vsTime
index a9ee6bb3e7..94a6a7d8c4 100644
--- a/tutorials/incompressible/pimpleFoam/TJunction/constant/p0vsTime
+++ b/tutorials/incompressible/pimpleFoam/TJunction/constant/p0vsTime
@@ -1,4 +1,4 @@
 (
-    (0 100010)
-    (1 100040)
+    (0 10)
+    (1 40)
 )
diff --git a/tutorials/incompressible/pimpleFoam/TJunctionFan/0/p b/tutorials/incompressible/pimpleFoam/TJunctionFan/0/p
index 66f5c1d712..5683c54dce 100644
--- a/tutorials/incompressible/pimpleFoam/TJunctionFan/0/p
+++ b/tutorials/incompressible/pimpleFoam/TJunctionFan/0/p
@@ -17,7 +17,7 @@ FoamFile
 
 dimensions      [0 2 -2 0 0 0 0];
 
-internalField   uniform 100000;
+internalField   uniform 0;
 
 boundaryField
 {
@@ -27,20 +27,20 @@ boundaryField
         rho             none;
         psi             none;
         gamma           1;
-        p0              100040;
+        p0              40;
         fileName        "$FOAM_CASE/constant/p0vsTime";
         outOfBounds     clamp;
-        value           uniform 100040;
+        value           uniform 40;
     }
     outlet1
     {
         type            fixedValue;
-        value           uniform 100010;
+        value           uniform 10;
     }
     outlet2
     {
         type            fixedValue;
-        value           uniform 100000;
+        value           uniform 0;
     }
     baffles
     {
@@ -50,6 +50,7 @@ boundaryField
     {
         type            fan;
         patchType       cyclic;
+        jump            uniform 0;
         f               2(100 -0.1);
         value           uniform 0;
     }
@@ -57,6 +58,7 @@ boundaryField
     {
         type            fan;
         patchType       cyclic;
+        jump            uniform 0;
         f               2(100 -0.1);
         value           uniform 0;
     }
diff --git a/tutorials/incompressible/pimpleFoam/TJunctionFan/Allrun b/tutorials/incompressible/pimpleFoam/TJunctionFan/Allrun
index 0d96a34fc9..84758693b8 100755
--- a/tutorials/incompressible/pimpleFoam/TJunctionFan/Allrun
+++ b/tutorials/incompressible/pimpleFoam/TJunctionFan/Allrun
@@ -9,21 +9,16 @@ application=`getApplication`
 runApplication blockMesh
 
 
-# Creating patches 'out of nothing' so willl get undefined value which
+# Creating patches 'out of nothing' so will get undefined value which
 # might cause floating point error
 unset FOAM_SIGFPE
 unset FOAM_SETNAN
 
-# Add cyclic baffles for fan
-runApplication setSet -batch selectCyclics.setSet
-#runApplication createBaffles cyclicFaces '(fan_half0 fan_half1)' -overwrite
+# Create faceZones for fan and baffles
+runApplication topoSet
+# Create fan cyclics
 createBaffles cyclicFaces '(fan_half0 fan_half1)' -overwrite > log.createBaffles 2>&1
-
-# Add wall baffles
-rm log.setSet
-runApplication setSet -batch selectBaffles.setSet
-rm log.createBaffles
-#runApplication createBaffles baffleFaces '(baffles baffles)' -overwrite
+# Create wall baffles
 createBaffles baffleFaces '(baffles baffles)' -overwrite > log.createBaffles 2>&1
 
 runApplication $application
diff --git a/tutorials/incompressible/pimpleFoam/TJunctionFan/constant/p0vsTime b/tutorials/incompressible/pimpleFoam/TJunctionFan/constant/p0vsTime
index a9ee6bb3e7..94a6a7d8c4 100644
--- a/tutorials/incompressible/pimpleFoam/TJunctionFan/constant/p0vsTime
+++ b/tutorials/incompressible/pimpleFoam/TJunctionFan/constant/p0vsTime
@@ -1,4 +1,4 @@
 (
-    (0 100010)
-    (1 100040)
+    (0 10)
+    (1 40)
 )
diff --git a/tutorials/incompressible/pimpleFoam/TJunctionFan/selectBaffles.setSet b/tutorials/incompressible/pimpleFoam/TJunctionFan/selectBaffles.setSet
deleted file mode 100644
index b3e31fc713..0000000000
--- a/tutorials/incompressible/pimpleFoam/TJunctionFan/selectBaffles.setSet
+++ /dev/null
@@ -1,4 +0,0 @@
-faceSet baffleFaces new boxToFace (0.099 -10 -10)(0.101 10 10)
-# Remove the centre faces that become fan
-faceSet baffleFaces delete boxToFace (0.099 -0.006 0.004)(0.101 0.006 0.016)
-faceZoneSet baffleFaces new setToFaceZone baffleFaces
diff --git a/tutorials/incompressible/pimpleFoam/TJunctionFan/selectCyclics.setSet b/tutorials/incompressible/pimpleFoam/TJunctionFan/selectCyclics.setSet
deleted file mode 100644
index 4dc1033bd2..0000000000
--- a/tutorials/incompressible/pimpleFoam/TJunctionFan/selectCyclics.setSet
+++ /dev/null
@@ -1,3 +0,0 @@
-faceSet cyclicFaces new boxToFace (0.099 -0.006 0.004)(0.101 0.006 0.016)
-cellSet cyclicFacesSlaveCells new boxToCell (-10 -10 -10)(0.1 10 10)
-faceZoneSet cyclicFaces new setsToFaceZone cyclicFaces cyclicFacesSlaveCells
diff --git a/tutorials/incompressible/pimpleFoam/TJunctionFan/system/topoSetDict b/tutorials/incompressible/pimpleFoam/TJunctionFan/system/topoSetDict
new file mode 100644
index 0000000000..28624e9e56
--- /dev/null
+++ b/tutorials/incompressible/pimpleFoam/TJunctionFan/system/topoSetDict
@@ -0,0 +1,88 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  2.0.0                                 |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    object      topoSetDict;
+}
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+actions
+(
+    {
+        name    cyclicFaces;
+        type    faceSet;
+        action  new;
+        source  boxToFace;
+        sourceInfo
+        {
+            box (0.099 -0.006 0.004)(0.101 0.006 0.016);
+        }
+    }
+
+    {
+        name    cyclicFacesSlaveCells;
+        type    cellSet;
+        action  new;
+        source  boxToCell;
+        sourceInfo
+        {
+            box (-10 -10 -10)(0.1 10 10);
+        }
+    }
+
+    {
+        name    cyclicFaces;
+        type    faceZoneSet;
+        action  new;
+        source  setsToFaceZone;
+        sourceInfo
+        {
+            faceSet cyclicFaces;
+            cellSet cyclicFacesSlaveCells;
+        }
+    }
+
+    {
+        name    baffleFaces;
+        type    faceSet;
+        action  new;
+        source  boxToFace;
+        sourceInfo
+        {
+            box (0.099 -10 -10)(0.101 10 10);
+        }
+    }
+
+    {
+        name    baffleFaces;
+        type    faceSet;
+        action  delete;
+        source  boxToFace;
+        sourceInfo
+        {
+            box (0.099 -0.006 0.004)(0.101 0.006 0.016);
+        }
+    }
+
+    {
+        name    baffleFaces;
+        type    faceZoneSet;
+        action  new;
+        source  setToFaceZone;
+        sourceInfo
+        {
+            faceSet baffleFaces;
+        }
+    }
+);
+
+// ************************************************************************* //