diff --git a/tutorials/incompressible/pimpleFoam/t-junction-with-fan/0/U b/tutorials/incompressible/pimpleFoam/t-junction-with-fan/0/U
new file mode 100644
index 0000000000000000000000000000000000000000..8b3863aff9ee75866d55618473a8c18a4366f645
--- /dev/null
+++ b/tutorials/incompressible/pimpleFoam/t-junction-with-fan/0/U
@@ -0,0 +1,59 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  1.6                                   |
+|   \\  /    A nd           | Web:      http://www.OpenFOAM.org               |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       volVectorField;
+    object      U;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions      [0 1 -1 0 0 0 0];
+
+internalField   uniform (0 0 0);
+
+boundaryField
+{
+    inlet
+    {
+        type            pressureInletOutletVelocity;
+        value           uniform (0 0 0);
+    }
+
+    outlet1
+    {
+        type            inletOutlet;
+        inletValue      uniform (0 0 0);
+        value           uniform (0 0 0);
+    }
+
+    outlet2
+    {
+        type            inletOutlet;
+        inletValue      uniform (0 0 0);
+        value           uniform (0 0 0);
+    }
+    baffles
+    {
+        type            fixedValue;
+        value           uniform ( 0 0 0 );
+    }
+    fan
+    {
+        type            cyclic;
+        value           uniform ( 0 0 0 );
+    }
+    defaultFaces
+    {
+        type            fixedValue;
+        value           uniform (0 0 0);
+    }
+}
+
+// ************************************************************************* //
diff --git a/tutorials/incompressible/pimpleFoam/t-junction-with-fan/0/epsilon b/tutorials/incompressible/pimpleFoam/t-junction-with-fan/0/epsilon
new file mode 100644
index 0000000000000000000000000000000000000000..35ddfed6617fe6722388c66a195947607a3568bb
--- /dev/null
+++ b/tutorials/incompressible/pimpleFoam/t-junction-with-fan/0/epsilon
@@ -0,0 +1,61 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  1.6                                   |
+|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       volScalarField;
+    location    "0";
+    object      epsilon;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions      [ 0 2 -3 0 0 0 0 ];
+
+internalField   uniform 1;
+
+boundaryField
+{
+    inlet
+    {
+        type            turbulentMixingLengthDissipationRateInlet;
+        mixingLength    0.01;       // 1cm - half channel height
+        value           uniform 1;
+    }
+    outlet1
+    {
+        type            inletOutlet;
+        inletValue      uniform 1;
+        value           uniform 1;
+    }
+
+    outlet2
+    {
+        type            inletOutlet;
+        inletValue      uniform 1;
+        value           uniform 1;
+    }
+    baffles
+    {
+        type            epsilonWallFunction;
+        value           uniform 1;
+    }
+    fan
+    {
+        type            cyclic;
+        value           uniform 1;
+    }
+    defaultFaces
+    {
+        type            epsilonWallFunction;
+        value           uniform 1;
+    }
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/incompressible/pimpleFoam/t-junction-with-fan/0/k b/tutorials/incompressible/pimpleFoam/t-junction-with-fan/0/k
new file mode 100644
index 0000000000000000000000000000000000000000..e87a5855d2cf51fe91b10aaf4de295e5377ad5c0
--- /dev/null
+++ b/tutorials/incompressible/pimpleFoam/t-junction-with-fan/0/k
@@ -0,0 +1,62 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  1.6                                   |
+|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       volScalarField;
+    location    "0";
+    object      k;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions      [ 0 2 -2 0 0 0 0 ];
+
+internalField   uniform 1;
+
+boundaryField
+{
+    inlet
+    {
+        type            turbulentIntensityKineticEnergyInlet;
+        intensity       0.05;       // 5% turbulent intensity
+        value           uniform 1;
+    }
+    outlet1
+    {
+        type            inletOutlet;
+        inletValue      uniform 1;
+        value           uniform 1;
+    }
+
+    outlet2
+    {
+        type            inletOutlet;
+        inletValue      uniform 1;
+        value           uniform 1;
+    }
+    baffles
+    {
+        type            kqRWallFunction;
+        value           uniform 1;
+    }
+    fan
+    {
+        type            cyclic;
+        value           uniform 1;
+    }
+
+    defaultFaces
+    {
+        type            kqRWallFunction;
+        value           uniform 1;
+    }
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/incompressible/pimpleFoam/t-junction-with-fan/0/nuTilda b/tutorials/incompressible/pimpleFoam/t-junction-with-fan/0/nuTilda
new file mode 100644
index 0000000000000000000000000000000000000000..ff51eab08cf73307d699f0f4d70261a9094c11ce
--- /dev/null
+++ b/tutorials/incompressible/pimpleFoam/t-junction-with-fan/0/nuTilda
@@ -0,0 +1,52 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  1.6                                   |
+|   \\  /    A nd           | Web:      http://www.OpenFOAM.org               |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       volScalarField;
+    object      nuTilda;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions      [0 2 -1 0 0 0 0];
+
+internalField   uniform 0;
+
+boundaryField
+{
+    inlet
+    {
+        type            zeroGradient;
+    }
+
+    outlet1
+    {
+        type            zeroGradient;
+    }
+
+    outlet2
+    {
+        type            zeroGradient;
+    }
+    baffles
+    {
+        type            zeroGradient;
+    }
+    fan
+    {
+        type            cyclic;
+        value           uniform 0;
+    }
+    defaultFaces
+    {
+        type            zeroGradient;
+    }
+}
+
+// ************************************************************************* //
diff --git a/tutorials/incompressible/pimpleFoam/t-junction-with-fan/0/nut b/tutorials/incompressible/pimpleFoam/t-junction-with-fan/0/nut
new file mode 100644
index 0000000000000000000000000000000000000000..570f1f90ac5188e944d686866217964790e2118d
--- /dev/null
+++ b/tutorials/incompressible/pimpleFoam/t-junction-with-fan/0/nut
@@ -0,0 +1,59 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  1.6                                   |
+|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|    \\/     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;
+    }
+
+    outlet1
+    {
+        type            calculated;
+        value           uniform 0;
+    }
+
+    outlet2
+    {
+        type            calculated;
+        value           uniform 0;
+    }
+    baffles
+    {
+        type            nutkWallFunction;
+        value           uniform 0;
+    }
+    fan
+    {
+        type            cyclic;
+        value           uniform 0;
+    }
+    defaultFaces
+    {
+        type            nutkWallFunction;
+        value           uniform 0;
+    }
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/incompressible/pimpleFoam/t-junction-with-fan/0/p b/tutorials/incompressible/pimpleFoam/t-junction-with-fan/0/p
new file mode 100644
index 0000000000000000000000000000000000000000..d9873e5b7a0f87d7979976f2b630a6cdcf3e26c1
--- /dev/null
+++ b/tutorials/incompressible/pimpleFoam/t-junction-with-fan/0/p
@@ -0,0 +1,69 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  1.6                                   |
+|   \\  /    A nd           | Web:      http://www.OpenFOAM.org               |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       volScalarField;
+    object      p;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions      [0 2 -2 0 0 0 0];
+
+internalField   uniform 100000;
+
+boundaryField
+{
+    inlet
+    {
+        //type            totalPressure;
+        //p0              uniform 100040;
+
+        type            timeVaryingTotalPressure;
+        p0              100040; // only used for restarts
+        outOfBounds     clamp;
+        fileName        "$FOAM_CASE/constant/p0vsTime";
+
+        U               U;
+        phi             phi;
+        rho             none;
+        psi             none;
+        gamma           1;
+        value           uniform 100040;
+    }
+
+    outlet1
+    {
+        type            fixedValue;
+        value           uniform 100010;
+    }
+
+    outlet2
+    {
+        type            fixedValue;
+        value           uniform 100000;
+    }
+    baffles
+    {
+        type            zeroGradient;
+    }
+    fan
+    {
+        type            fan;
+        patchType       cyclic;
+        f               2 ( 50 -0.1 );
+        value           uniform 100000;
+    }
+    defaultFaces
+    {
+        type            zeroGradient;
+    }
+}
+
+// ************************************************************************* //
diff --git a/tutorials/incompressible/pimpleFoam/t-junction/Allrun b/tutorials/incompressible/pimpleFoam/t-junction-with-fan/Allrun
similarity index 100%
rename from tutorials/incompressible/pimpleFoam/t-junction/Allrun
rename to tutorials/incompressible/pimpleFoam/t-junction-with-fan/Allrun
diff --git a/tutorials/incompressible/pimpleFoam/t-junction-with-fan/README.txt b/tutorials/incompressible/pimpleFoam/t-junction-with-fan/README.txt
new file mode 100644
index 0000000000000000000000000000000000000000..fd3f970be58f695ca0eb8f2b82e7c39ced0700b6
--- /dev/null
+++ b/tutorials/incompressible/pimpleFoam/t-junction-with-fan/README.txt
@@ -0,0 +1,3 @@
+300-04-16 T-junction with baffles and fan.
+Inlet on left, one outlet at bottom, one at top.
+To test multiple outlets.
diff --git a/tutorials/incompressible/pimpleFoam/t-junction-with-fan/constant/RASProperties b/tutorials/incompressible/pimpleFoam/t-junction-with-fan/constant/RASProperties
new file mode 100644
index 0000000000000000000000000000000000000000..81b1ec9115226882e6e980b8e5f4e19cabb886d9
--- /dev/null
+++ b/tutorials/incompressible/pimpleFoam/t-junction-with-fan/constant/RASProperties
@@ -0,0 +1,25 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  1.6                                   |
+|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    location    "constant";
+    object      RASProperties;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+RASModel        kEpsilon;
+
+turbulence      on;
+
+printCoeffs     on;
+
+
+// ************************************************************************* //
diff --git a/tutorials/incompressible/pimpleFoam/t-junction-with-fan/constant/p0vsTime b/tutorials/incompressible/pimpleFoam/t-junction-with-fan/constant/p0vsTime
new file mode 100644
index 0000000000000000000000000000000000000000..a9ee6bb3e731e823200464b47f6437328c7f48ef
--- /dev/null
+++ b/tutorials/incompressible/pimpleFoam/t-junction-with-fan/constant/p0vsTime
@@ -0,0 +1,4 @@
+(
+    (0 100010)
+    (1 100040)
+)
diff --git a/tutorials/incompressible/pimpleFoam/t-junction-with-fan/constant/polyMesh/blockMeshDict b/tutorials/incompressible/pimpleFoam/t-junction-with-fan/constant/polyMesh/blockMeshDict
new file mode 100644
index 0000000000000000000000000000000000000000..5e97f00deb0f66dd3126366c89d2659512dde203
--- /dev/null
+++ b/tutorials/incompressible/pimpleFoam/t-junction-with-fan/constant/polyMesh/blockMeshDict
@@ -0,0 +1,119 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  1.6                                   |
+|   \\  /    A nd           | Web:      http://www.OpenFOAM.org               |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    object      blockMeshDict;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+//           outlet1
+//             +-+
+//             | |
+//             | |
+//             | |
+//             | |
+// +-----------+ |
+// |inlet        |
+// +-----------+ |
+//             | |
+//             | |
+//             | |
+//             | |
+//             +-+
+//           outlet2
+
+convertToMeters 1;
+
+vertices        
+(
+    (0.0  -0.01 0)   //0
+    (0.2  -0.01 0)
+    (0.2   0.01 0)   //2
+    (0.0   0.01 0)
+
+    (0.22 -0.01 0)  //4
+    (0.22  0.01 0)
+
+    (0.2  -0.21 0)  //6
+    (0.22 -0.21 0)
+
+    (0.2   0.21 0)  //8
+    (0.22  0.21 0)
+
+    // Z
+    (0.0  -0.01 0.02)   //0
+    (0.2  -0.01 0.02)
+    (0.2   0.01 0.02)   //2
+    (0.0   0.01 0.02)
+
+    (0.22 -0.01 0.02)  //4
+    (0.22  0.01 0.02)
+
+    (0.2  -0.21 0.02)  //6
+    (0.22 -0.21 0.02)
+
+    (0.2   0.21 0.02)  //8
+    (0.22  0.21 0.02)
+
+);
+
+blocks          
+(
+    // inlet block
+    hex (0 1 2 3  10 11 12 13) (50 5 5) simpleGrading (1 1 1)
+
+    // central block
+    hex (1 4 5 2  11 14 15 12) (5 5 5) simpleGrading (1 1 1)
+
+    // bottom block
+    hex (6 7 4 1  16 17 14 11) (5 50 5) simpleGrading (1 1 1)
+
+    // top block
+    hex (2 5 9 8  12 15 19 18) (5 50 5) simpleGrading (1 1 1)
+);
+
+edges           
+(
+);
+
+patches         
+(
+    patch inlet
+    (
+        (0 10 13 3)
+    )
+
+    patch outlet1
+    (
+        (6 7 17 16)
+    )
+
+    patch outlet2
+    (
+        (8 18 19 9)
+    )
+
+    wall baffles
+    ()
+
+    cyclic fan
+    ()
+
+    wall defaultFaces
+    ()
+
+);
+
+mergePatchPairs
+(
+);
+
+// ************************************************************************* //
diff --git a/tutorials/incompressible/pimpleFoam/t-junction/constant/polyMesh/boundary b/tutorials/incompressible/pimpleFoam/t-junction-with-fan/constant/polyMesh/boundary
similarity index 100%
rename from tutorials/incompressible/pimpleFoam/t-junction/constant/polyMesh/boundary
rename to tutorials/incompressible/pimpleFoam/t-junction-with-fan/constant/polyMesh/boundary
diff --git a/tutorials/incompressible/pimpleFoam/t-junction-with-fan/constant/transportProperties b/tutorials/incompressible/pimpleFoam/t-junction-with-fan/constant/transportProperties
new file mode 100644
index 0000000000000000000000000000000000000000..36e9669391c8c0057688bb7b2bc38072dbd5ce5f
--- /dev/null
+++ b/tutorials/incompressible/pimpleFoam/t-junction-with-fan/constant/transportProperties
@@ -0,0 +1,39 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  1.6                                   |
+|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    location    "constant";
+    object      transportProperties;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+transportModel  Newtonian;
+
+nu              nu [ 0 2 -1 0 0 0 0 ] 1e-05;
+
+CrossPowerLawCoeffs
+{
+    nu0             nu0 [ 0 2 -1 0 0 0 0 ] 1e-06;
+    nuInf           nuInf [ 0 2 -1 0 0 0 0 ] 1e-06;
+    m               m [ 0 0 1 0 0 0 0 ] 1;
+    n               n [ 0 0 0 0 0 0 0 ] 1;
+}
+
+BirdCarreauCoeffs
+{
+    nu0             nu0 [ 0 2 -1 0 0 0 0 ] 1e-06;
+    nuInf           nuInf [ 0 2 -1 0 0 0 0 ] 1e-06;
+    k               k [ 0 0 1 0 0 0 0 ] 0;
+    n               n [ 0 0 0 0 0 0 0 ] 1;
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/incompressible/pimpleFoam/t-junction-with-fan/constant/turbulenceProperties b/tutorials/incompressible/pimpleFoam/t-junction-with-fan/constant/turbulenceProperties
new file mode 100644
index 0000000000000000000000000000000000000000..70e87dd27b9dda8a572bd832f1488e799a6d2825
--- /dev/null
+++ b/tutorials/incompressible/pimpleFoam/t-junction-with-fan/constant/turbulenceProperties
@@ -0,0 +1,20 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  1.6                                   |
+|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    location    "constant";
+    object      turbulenceProperties;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+simulationType RASModel;
+
+// ************************************************************************* //
diff --git a/tutorials/incompressible/pimpleFoam/t-junction/selectBaffles.setSet b/tutorials/incompressible/pimpleFoam/t-junction-with-fan/selectBaffles.setSet
similarity index 100%
rename from tutorials/incompressible/pimpleFoam/t-junction/selectBaffles.setSet
rename to tutorials/incompressible/pimpleFoam/t-junction-with-fan/selectBaffles.setSet
diff --git a/tutorials/incompressible/pimpleFoam/t-junction/selectCyclics.setSet b/tutorials/incompressible/pimpleFoam/t-junction-with-fan/selectCyclics.setSet
similarity index 100%
rename from tutorials/incompressible/pimpleFoam/t-junction/selectCyclics.setSet
rename to tutorials/incompressible/pimpleFoam/t-junction-with-fan/selectCyclics.setSet
diff --git a/tutorials/incompressible/pimpleFoam/t-junction-with-fan/system/controlDict b/tutorials/incompressible/pimpleFoam/t-junction-with-fan/system/controlDict
new file mode 100644
index 0000000000000000000000000000000000000000..a966fe894ba5b973e3f4d5bf3bef74d376688ca5
--- /dev/null
+++ b/tutorials/incompressible/pimpleFoam/t-junction-with-fan/system/controlDict
@@ -0,0 +1,86 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  1.6                                   |
+|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    location    "system";
+    object      controlDict;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+libs            ("libOpenFOAM.so" "libincompressibleTurbulenceModel.so" "libincompressibleRASModels.so");
+
+application     pimpleFoam;
+
+startFrom       startTime;
+
+startTime       0;
+
+stopAt          endTime;
+
+endTime         1;
+
+deltaT          0.001;
+
+writeControl    adjustableRunTime;
+
+writeInterval   0.1;
+
+purgeWrite      0;
+
+writeFormat     ascii;
+
+writePrecision  6;
+
+writeCompression uncompressed;
+
+timeFormat      general;
+
+timePrecision   6;
+
+runTimeModifiable true;
+
+adjustTimeStep  yes;
+
+maxCo           5;
+
+functions
+{
+    probes
+    {
+        // Where to load it from
+        functionObjectLibs ( "libsampling.so" );
+
+        type            probes;
+
+        // Name of the directory for probe data
+        name            probes;
+
+        // Write at same frequency as fields
+        outputControl   outputTime;
+        outputInterval  1;
+
+        // Fields to be probed
+        fields
+        (
+            p U
+        );
+
+        probeLocations
+        (
+            ( 1e-06 0 0.01 )        // at inlet
+            ( 0.21 -0.20999 0.01 )  // at outlet1
+            ( 0.21 0.20999 0.01 )   // at outlet2
+            ( 0.21 0 0.01 )         // at central block
+        );
+    }
+}
+
+// ************************************************************************* //
diff --git a/tutorials/incompressible/pimpleFoam/t-junction-with-fan/system/fvSchemes b/tutorials/incompressible/pimpleFoam/t-junction-with-fan/system/fvSchemes
new file mode 100644
index 0000000000000000000000000000000000000000..6b14062252ea77a784c3289fc96718a31094d0cd
--- /dev/null
+++ b/tutorials/incompressible/pimpleFoam/t-junction-with-fan/system/fvSchemes
@@ -0,0 +1,71 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  1.6                                   |
+|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    location    "system";
+    object      fvSchemes;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+ddtSchemes
+{
+    default         Euler;
+}
+
+gradSchemes
+{
+    default         Gauss linear;
+    grad(p)         Gauss linear;
+    grad(U)         Gauss linear;
+}
+
+divSchemes
+{
+    default         none;
+    div(phi,U)      Gauss limitedLinearV 1;
+    div(phi,k)      Gauss limitedLinear 1;
+    div(phi,epsilon) Gauss limitedLinear 1;
+    div(phi,R)      Gauss limitedLinear 1;
+    div(R)          Gauss linear;
+    div(phi,nuTilda) Gauss limitedLinear 1;
+    div((nuEff*dev(grad(U).T()))) Gauss linear;
+}
+
+laplacianSchemes
+{
+    default         none;
+    laplacian(nuEff,U) Gauss linear corrected;
+    laplacian((1|A(U)),p) Gauss linear corrected;
+    laplacian(DkEff,k) Gauss linear corrected;
+    laplacian(DepsilonEff,epsilon) Gauss linear corrected;
+    laplacian(DREff,R) Gauss linear corrected;
+    laplacian(DnuTildaEff,nuTilda) Gauss linear corrected;
+}
+
+interpolationSchemes
+{
+    default         linear;
+    interpolate(U)  linear;
+}
+
+snGradSchemes
+{
+    default         corrected;
+}
+
+fluxRequired
+{
+    default         no;
+    p               ;
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/incompressible/pimpleFoam/t-junction-with-fan/system/fvSolution b/tutorials/incompressible/pimpleFoam/t-junction-with-fan/system/fvSolution
new file mode 100644
index 0000000000000000000000000000000000000000..5a9f970576f5d40f5e374cdea918ed11b483351b
--- /dev/null
+++ b/tutorials/incompressible/pimpleFoam/t-junction-with-fan/system/fvSolution
@@ -0,0 +1,94 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  1.6                                   |
+|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    location    "system";
+    object      fvSolution;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+solvers
+{
+    p
+    {
+        solver          GAMG;
+        tolerance       1e-06;
+        relTol          0.01;
+        smoother        GaussSeidel;
+        cacheAgglomeration true;
+        nCellsInCoarsestLevel 10;
+        agglomerator    faceAreaPair;
+        mergeLevels     1;
+    }
+
+    pFinal
+    {
+        solver          GAMG;
+        tolerance       1e-06;
+        relTol          0;
+        smoother        GaussSeidel;
+        cacheAgglomeration true;
+        nCellsInCoarsestLevel 10;
+        agglomerator    faceAreaPair;
+        mergeLevels     1;
+    }
+
+    U
+    {
+        solver          PBiCG;
+        preconditioner  DILU;
+        tolerance       1e-05;
+        relTol          0.1;
+    }
+
+    UFinal
+    {
+        solver          PBiCG;
+        preconditioner  DILU;
+        tolerance       1e-05;
+        relTol          0;
+    }
+
+    k
+    {
+        solver          PBiCG;
+        preconditioner  DILU;
+        tolerance       1e-05;
+        relTol          0;
+    }
+
+    epsilon
+    {
+        solver          PBiCG;
+        preconditioner  DILU;
+        tolerance       1e-05;
+        relTol          0;
+    }
+}
+
+PIMPLE
+{
+    nOuterCorrectors 2;
+    nCorrectors     2;
+    nNonOrthogonalCorrectors 0;
+    pRefCell        0;
+    pRefValue       0;
+}
+
+relaxationFactors
+{
+    U               1;
+    k               1;
+    epsilon         1;
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/incompressible/pimpleFoam/t-junction/0/U b/tutorials/incompressible/pimpleFoam/t-junction/0/U
index 8b3863aff9ee75866d55618473a8c18a4366f645..937d3966b255a95cf121b0233e6c1ad9cfe79759 100644
--- a/tutorials/incompressible/pimpleFoam/t-junction/0/U
+++ b/tutorials/incompressible/pimpleFoam/t-junction/0/U
@@ -20,36 +20,27 @@ internalField   uniform (0 0 0);
 
 boundaryField
 {
-    inlet
+    inlet      
     {
         type            pressureInletOutletVelocity;
         value           uniform (0 0 0);
     }
 
-    outlet1
+    outlet1    
     {
         type            inletOutlet;
         inletValue      uniform (0 0 0);
         value           uniform (0 0 0);
     }
 
-    outlet2
+    outlet2   
     {
         type            inletOutlet;
         inletValue      uniform (0 0 0);
         value           uniform (0 0 0);
     }
-    baffles
-    {
-        type            fixedValue;
-        value           uniform ( 0 0 0 );
-    }
-    fan
-    {
-        type            cyclic;
-        value           uniform ( 0 0 0 );
-    }
-    defaultFaces
+
+    defaultFaces      
     {
         type            fixedValue;
         value           uniform (0 0 0);
diff --git a/tutorials/incompressible/pimpleFoam/t-junction/0/epsilon b/tutorials/incompressible/pimpleFoam/t-junction/0/epsilon
index 35ddfed6617fe6722388c66a195947607a3568bb..98515b441d1ad8af8d69153722bfb7e6143af640 100644
--- a/tutorials/incompressible/pimpleFoam/t-junction/0/epsilon
+++ b/tutorials/incompressible/pimpleFoam/t-junction/0/epsilon
@@ -27,33 +27,23 @@ boundaryField
         mixingLength    0.01;       // 1cm - half channel height
         value           uniform 1;
     }
+
     outlet1
     {
         type            inletOutlet;
         inletValue      uniform 1;
-        value           uniform 1;
     }
 
     outlet2
     {
         type            inletOutlet;
         inletValue      uniform 1;
-        value           uniform 1;
-    }
-    baffles
-    {
-        type            epsilonWallFunction;
-        value           uniform 1;
-    }
-    fan
-    {
-        type            cyclic;
-        value           uniform 1;
     }
+
     defaultFaces
     {
         type            epsilonWallFunction;
-        value           uniform 1;
+        value           uniform 0;
     }
 }
 
diff --git a/tutorials/incompressible/pimpleFoam/t-junction/0/k b/tutorials/incompressible/pimpleFoam/t-junction/0/k
index e87a5855d2cf51fe91b10aaf4de295e5377ad5c0..35f4e42f328d91108c3f44466c080b45dfaa1c0e 100644
--- a/tutorials/incompressible/pimpleFoam/t-junction/0/k
+++ b/tutorials/incompressible/pimpleFoam/t-junction/0/k
@@ -27,34 +27,23 @@ boundaryField
         intensity       0.05;       // 5% turbulent intensity
         value           uniform 1;
     }
+
     outlet1
     {
         type            inletOutlet;
         inletValue      uniform 1;
-        value           uniform 1;
     }
 
     outlet2
     {
         type            inletOutlet;
         inletValue      uniform 1;
-        value           uniform 1;
-    }
-    baffles
-    {
-        type            kqRWallFunction;
-        value           uniform 1;
-    }
-    fan
-    {
-        type            cyclic;
-        value           uniform 1;
     }
 
     defaultFaces
     {
         type            kqRWallFunction;
-        value           uniform 1;
+        value           uniform 0;
     }
 }
 
diff --git a/tutorials/incompressible/pimpleFoam/t-junction/0/nuTilda b/tutorials/incompressible/pimpleFoam/t-junction/0/nuTilda
index ff51eab08cf73307d699f0f4d70261a9094c11ce..fe8744b3989e69e694abd968d917fcb1fb9afc32 100644
--- a/tutorials/incompressible/pimpleFoam/t-junction/0/nuTilda
+++ b/tutorials/incompressible/pimpleFoam/t-junction/0/nuTilda
@@ -34,15 +34,7 @@ boundaryField
     {
         type            zeroGradient;
     }
-    baffles
-    {
-        type            zeroGradient;
-    }
-    fan
-    {
-        type            cyclic;
-        value           uniform 0;
-    }
+
     defaultFaces
     {
         type            zeroGradient;
diff --git a/tutorials/incompressible/pimpleFoam/t-junction/0/nut b/tutorials/incompressible/pimpleFoam/t-junction/0/nut
index 570f1f90ac5188e944d686866217964790e2118d..b4a42336aae3ebcf05326e632164ac94f74da617 100644
--- a/tutorials/incompressible/pimpleFoam/t-junction/0/nut
+++ b/tutorials/incompressible/pimpleFoam/t-junction/0/nut
@@ -38,16 +38,7 @@ boundaryField
         type            calculated;
         value           uniform 0;
     }
-    baffles
-    {
-        type            nutkWallFunction;
-        value           uniform 0;
-    }
-    fan
-    {
-        type            cyclic;
-        value           uniform 0;
-    }
+
     defaultFaces
     {
         type            nutkWallFunction;
diff --git a/tutorials/incompressible/pimpleFoam/t-junction/0/p b/tutorials/incompressible/pimpleFoam/t-junction/0/p
index d9873e5b7a0f87d7979976f2b630a6cdcf3e26c1..93170d7a0cba0489f226d72d14e996c0755156c4 100644
--- a/tutorials/incompressible/pimpleFoam/t-junction/0/p
+++ b/tutorials/incompressible/pimpleFoam/t-junction/0/p
@@ -20,7 +20,7 @@ internalField   uniform 100000;
 
 boundaryField
 {
-    inlet
+    inlet      
     {
         //type            totalPressure;
         //p0              uniform 100040;
@@ -38,28 +38,18 @@ boundaryField
         value           uniform 100040;
     }
 
-    outlet1
+    outlet1     
     {
         type            fixedValue;
         value           uniform 100010;
     }
 
-    outlet2
+    outlet2    
     {
         type            fixedValue;
         value           uniform 100000;
     }
-    baffles
-    {
-        type            zeroGradient;
-    }
-    fan
-    {
-        type            fan;
-        patchType       cyclic;
-        f               2 ( 50 -0.1 );
-        value           uniform 100000;
-    }
+
     defaultFaces
     {
         type            zeroGradient;
diff --git a/tutorials/incompressible/pimpleFoam/t-junction/README.txt b/tutorials/incompressible/pimpleFoam/t-junction/README.txt
index fd3f970be58f695ca0eb8f2b82e7c39ced0700b6..0905f8784d3f59c9372dcbf858c093d8c4477ee7 100644
--- a/tutorials/incompressible/pimpleFoam/t-junction/README.txt
+++ b/tutorials/incompressible/pimpleFoam/t-junction/README.txt
@@ -1,3 +1,2 @@
-300-04-16 T-junction with baffles and fan.
-Inlet on left, one outlet at bottom, one at top.
+15/8/8 Simple T-junction. Inlet on left, one outlet at bottom, one at top.
 To test multiple outlets.
diff --git a/tutorials/incompressible/pimpleFoam/t-junction/constant/polyMesh/blockMeshDict b/tutorials/incompressible/pimpleFoam/t-junction/constant/polyMesh/blockMeshDict
index 5e97f00deb0f66dd3126366c89d2659512dde203..7f78827df0ae075da9cafda0600ea1a3ddc2811e 100644
--- a/tutorials/incompressible/pimpleFoam/t-junction/constant/polyMesh/blockMeshDict
+++ b/tutorials/incompressible/pimpleFoam/t-junction/constant/polyMesh/blockMeshDict
@@ -101,12 +101,6 @@ patches
         (8 18 19 9)
     )
 
-    wall baffles
-    ()
-
-    cyclic fan
-    ()
-
     wall defaultFaces
     ()