diff --git a/basics/advection-diffusion/basics-advection-diffusion.tex b/basics/advection-diffusion/basics-advection-diffusion.tex
index da3f45593df24b51947ad38c3305c1febb83f987..87ba5bdefd8c6198005f2657ba08d3b2d3c36e70 100644
--- a/basics/advection-diffusion/basics-advection-diffusion.tex
+++ b/basics/advection-diffusion/basics-advection-diffusion.tex
@@ -408,8 +408,8 @@ computed.
 After having configured the \inltt{VARIABLES} tag, the initial and
 boundary conditions, the advection velocity and the exact solution we
 can complete the tag \inltt{CONDITIONS} prescribing the parameters
-necessary (\inltt{PARAMETERS})and the solver settings
-(\inltt{SOLVERINFO}):
+necessary (\inltt{PARAMETERS}), solver settings (\inltt{SOLVERINFO}), 
+and time integration scheme (\inltt{TIMEINTEGRATIONSCHEME}):
 %
 \begin{lstlisting}[style=XMLStyle]
 <CONDITIONS>
@@ -429,8 +429,12 @@ necessary (\inltt{PARAMETERS})and the solver settings
         <I PROPERTY="Projection"            		VALUE="DisContinuous"       		/>
         <I PROPERTY="AdvectionType"      		VALUE="WeakDG"              		/>
         <I PROPERTY="UpwindType"           	VALUE="Upwind"              		/>
-        <I PROPERTY="TimeIntegrationMethod" 	VALUE="ClassicalRungeKutta4"	/>
     </SOLVERINFO>
+
+    <TIMEINTEGRATIONSCHEME> 
+        <METHOD> RungeKutta </METHOD> 
+        <ORDER> 4 </ORDER> 
+    </TIMEINTEGRATIONSCHEME>
     ...
     ...
     ...
@@ -453,8 +457,7 @@ to be solved, \inltt{Projection} is the spatial projection operator to
 be used (which in this case is specified to be `DisContinuous'),
 \inltt{AdvectionType} is the advection operator to be adopted (where the \inltt{VALUE} `WeakDG' implies the use of a weak Discontinuous Galerkin technique), \inltt{UpwindType} is the numerical 
 flux to be used at the element interfaces when a discontinuous
-projection is used, \inltt{TimeIntegrationMethod} allows selecting the
-time-integration scheme. For additional solver-setting options refer
+projection is used. For additional solver-setting options refer
 to the \href{http://www.nektar.info/src/user-guide-\nekver.pdf}{User-Guide}.
 
 Finally, we need to specify the expansion bases we want to use in each
@@ -524,7 +527,7 @@ screen output:
 	           Time Step: 0.001
 	        No. of Steps: 1000
 	 Checkpoints (steps): 100
-	    Integration Type: ClassicalRungeKutta4
+	    Integration Type: RungeKutta4
 ==========================================
 Initial Conditions:
   - Field u: sin(k*x)*cos(k*y)
diff --git a/basics/advection-diffusion/basics-advection-diffusion/completed/ADR_conditions.xml b/basics/advection-diffusion/basics-advection-diffusion/completed/ADR_conditions.xml
index 0306eafd8bcd26c2d216b5172ffb6ddcc34aa672..aad0aab29dbb39879977cb00eb8aa5650ed730d5 100644
--- a/basics/advection-diffusion/basics-advection-diffusion/completed/ADR_conditions.xml
+++ b/basics/advection-diffusion/basics-advection-diffusion/completed/ADR_conditions.xml
@@ -22,9 +22,13 @@
             <I PROPERTY="Projection"            VALUE="DisContinuous"       />
             <I PROPERTY="AdvectionType"         VALUE="WeakDG"              />
             <I PROPERTY="UpwindType"            VALUE="Upwind"              />
-            <I PROPERTY="TimeIntegrationMethod" VALUE="ClassicalRungeKutta4"/>
         </SOLVERINFO>
 
+        <TIMEINTEGRATIONSCHEME> 
+            <METHOD> RungeKutta </METHOD> 
+            <ORDER> 4 </ORDER> 
+        </TIMEINTEGRATIONSCHEME>
+
         <VARIABLES>
             <V ID="0"> u </V>
         </VARIABLES>
diff --git a/basics/advection-diffusion/basics-advection-diffusion/tutorial/ADR_conditions.xml b/basics/advection-diffusion/basics-advection-diffusion/tutorial/ADR_conditions.xml
index 0306eafd8bcd26c2d216b5172ffb6ddcc34aa672..aad0aab29dbb39879977cb00eb8aa5650ed730d5 100644
--- a/basics/advection-diffusion/basics-advection-diffusion/tutorial/ADR_conditions.xml
+++ b/basics/advection-diffusion/basics-advection-diffusion/tutorial/ADR_conditions.xml
@@ -22,9 +22,13 @@
             <I PROPERTY="Projection"            VALUE="DisContinuous"       />
             <I PROPERTY="AdvectionType"         VALUE="WeakDG"              />
             <I PROPERTY="UpwindType"            VALUE="Upwind"              />
-            <I PROPERTY="TimeIntegrationMethod" VALUE="ClassicalRungeKutta4"/>
         </SOLVERINFO>
 
+        <TIMEINTEGRATIONSCHEME> 
+            <METHOD> RungeKutta </METHOD> 
+            <ORDER> 4 </ORDER> 
+        </TIMEINTEGRATIONSCHEME>
+
         <VARIABLES>
             <V ID="0"> u </V>
         </VARIABLES>
diff --git a/cfs/CylinderSubsonic_NS/cfs-CylinderSubsonic_NS.tex b/cfs/CylinderSubsonic_NS/cfs-CylinderSubsonic_NS.tex
index 2095a33dd5ee0aa0e0f84b9d5dd50c3b15dd57d7..af2116fcb1843b0bb1eec46d786ee7ab56386193 100644
--- a/cfs/CylinderSubsonic_NS/cfs-CylinderSubsonic_NS.tex
+++ b/cfs/CylinderSubsonic_NS/cfs-CylinderSubsonic_NS.tex
@@ -474,7 +474,7 @@ presents the $FR_{DG}$ scheme, which recovers the $DG$ scheme with
 exact mass matrix, the $FR_{HU}$ scheme, which recovers the $DG$ scheme with lumped mass matrix and 
 the $FR_{SD}$ scheme, which recovers a spectral difference scheme. 
 We must also define the diffusion operator we want to use, which will be local Discontinuous Galerkin and 
-the time integration method which will be the Classical Runge Kutta of order 4. 
+the time integration method which will be the Runge Kutta of order 4. 
  
 \begin{tipbox}
 When selecting the Advection Type scheme, bear in mind that:
@@ -504,7 +504,7 @@ provide lower computational cost but lower accuracy.
 \begin{tutorialtask}
 In the .xml file under the tag \inltt{SOLVERINFO},
 define all the solver parameters as described above. These are declared as EQType, Projection,
-AdvectionType, DiffusionType, TimeIntegrationMethod, UpwindType, ViscosityType.
+AdvectionType, DiffusionType, UpwindType, ViscosityType.
 \end{tutorialtask}
 \begin{lstlisting}[style=XMLStyle]
  <SOLVERINFO>
@@ -512,7 +512,6 @@ AdvectionType, DiffusionType, TimeIntegrationMethod, UpwindType, ViscosityType.
         <I PROPERTY="Projection"            VALUE="DisContinuous"       />
         <I PROPERTY="AdvectionType"         VALUE="WeakDG"              />
         <I PROPERTY="DiffusionType"         VALUE="LDGNS"               />
-        <I PROPERTY="TimeIntegrationMethod" VALUE="ClassicalRungeKutta4"/>
         <I PROPERTY="UpwindType"            VALUE="HLLC"                />
         <I PROPERTY="ProblemType"           VALUE="General"             />
         <I PROPERTY="ViscosityType"         VALUE="Constant"            />
diff --git a/cfs/CylinderSubsonic_NS/cfs-CylinderSubsonic_NS/completed/1000steps/CylinderSubsonic_NS.xml b/cfs/CylinderSubsonic_NS/cfs-CylinderSubsonic_NS/completed/1000steps/CylinderSubsonic_NS.xml
index 3e0c34d0f1a33055c9a410c98f3e4586964b75c9..f880564b0939466f4d06aa30db96638ec738a59c 100644
--- a/cfs/CylinderSubsonic_NS/cfs-CylinderSubsonic_NS/completed/1000steps/CylinderSubsonic_NS.xml
+++ b/cfs/CylinderSubsonic_NS/cfs-CylinderSubsonic_NS/completed/1000steps/CylinderSubsonic_NS.xml
@@ -4090,12 +4090,16 @@
             <I PROPERTY="Projection"            VALUE="DisContinuous"       />
             <I PROPERTY="AdvectionType"         VALUE="WeakDG"              />
             <I PROPERTY="DiffusionType"         VALUE="LDGNS"               />
-            <I PROPERTY="TimeIntegrationMethod" VALUE="ClassicalRungeKutta4"/>
             <I PROPERTY="UpwindType"            VALUE="HLLC"                />
             <I PROPERTY="ProblemType"           VALUE="General"             />
             <I PROPERTY="ViscosityType"         VALUE="Constant"            />
         </SOLVERINFO>
-
+ 
+        <TIMEINTEGRATIONSCHEME> 
+            <METHOD> RungeKutta </METHOD> 
+            <ORDER> 4 </ORDER> 
+        </TIMEINTEGRATIONSCHEME>
+   
         <VARIABLES>
             <V ID="0"> rho  </V>
             <V ID="1"> rhou </V>
diff --git a/cfs/CylinderSubsonic_NS/cfs-CylinderSubsonic_NS/completed/Time0.6/CylinderSubsonic_NS.xml b/cfs/CylinderSubsonic_NS/cfs-CylinderSubsonic_NS/completed/Time0.6/CylinderSubsonic_NS.xml
index bdb8316f9b7c3087e67f1352e0b5032888ce1ba5..fcd46eb9bf1563b6e42e2a2a611e9c3a2feebce2 100644
--- a/cfs/CylinderSubsonic_NS/cfs-CylinderSubsonic_NS/completed/Time0.6/CylinderSubsonic_NS.xml
+++ b/cfs/CylinderSubsonic_NS/cfs-CylinderSubsonic_NS/completed/Time0.6/CylinderSubsonic_NS.xml
@@ -4091,12 +4091,16 @@
             <I PROPERTY="Projection"            VALUE="DisContinuous"       />
             <I PROPERTY="AdvectionType"         VALUE="WeakDG"              />
             <I PROPERTY="DiffusionType"         VALUE="LDGNS"               />
-            <I PROPERTY="TimeIntegrationMethod" VALUE="ClassicalRungeKutta4"/>
             <I PROPERTY="UpwindType"            VALUE="HLLC"                />
             <I PROPERTY="ProblemType"           VALUE="General"             />
             <I PROPERTY="ViscosityType"         VALUE="Constant"            />
         </SOLVERINFO>
 
+        <TIMEINTEGRATIONSCHEME> 
+            <METHOD> RungeKutta </METHOD> 
+            <ORDER> 4 </ORDER> 
+        </TIMEINTEGRATIONSCHEME>
+
         <VARIABLES>
             <V ID="0"> rho  </V>
             <V ID="1"> rhou </V>
diff --git a/cfs/CylinderSubsonic_NS/cfs-CylinderSubsonic_NS/tutorial/CylinderSubsonic_NS.xml b/cfs/CylinderSubsonic_NS/cfs-CylinderSubsonic_NS/tutorial/CylinderSubsonic_NS.xml
index fa73a9e1b46ddacc972acb7f201d3165c4125973..40085e918890fceeb78d83bf0d27a71218b7a628 100644
--- a/cfs/CylinderSubsonic_NS/cfs-CylinderSubsonic_NS/tutorial/CylinderSubsonic_NS.xml
+++ b/cfs/CylinderSubsonic_NS/cfs-CylinderSubsonic_NS/tutorial/CylinderSubsonic_NS.xml
@@ -4090,12 +4090,16 @@
             <I PROPERTY="Projection"            VALUE=""       />
             <I PROPERTY="AdvectionType"         VALUE=""              />
             <I PROPERTY="DiffusionType"         VALUE="LDGNS"               />
-            <I PROPERTY="TimeIntegrationMethod" VALUE=""/>
             <I PROPERTY="UpwindType"            VALUE=""                />
             <I PROPERTY="ProblemType"           VALUE="General"             />
             <I PROPERTY="ViscosityType"         VALUE=""            />
         </SOLVERINFO>
 
+        <TIMEINTEGRATIONSCHEME> 
+            <METHOD> </METHOD> 
+            <ORDER> </ORDER> 
+        </TIMEINTEGRATIONSCHEME>
+
         <VARIABLES>
             <V ID="0"> rho  </V>
             <V ID="1"> rhou </V>
diff --git a/events/2011/Cambridge-AIM/Channel/Base/Channel-Base.xml b/events/2011/Cambridge-AIM/Channel/Base/Channel-Base.xml
index d73747cdd77c45909eb18c611d8f3ce6eb2cb287..6d86181e867dece2935e55ff8b12b2fc00ff351b 100644
--- a/events/2011/Cambridge-AIM/Channel/Base/Channel-Base.xml
+++ b/events/2011/Cambridge-AIM/Channel/Base/Channel-Base.xml
@@ -6,12 +6,14 @@
             <I PROPERTY="EQTYPE" VALUE="UnsteadyNavierStokes"/>
             <I PROPERTY="EvolutionOperator" VALUE="Nonlinear"/>
             <I PROPERTY="Projection" VALUE="Continuous"/>
-            <I PROPERTY="TimeIntegrationMethod" VALUE="IMEXOrder3"/>
             <I PROPERTY="Driver" VALUE="Standard"/>
-
-
         </SOLVERINFO>
 
+        <TIMEINTEGRATIONSCHEME> 
+            <METHOD> IMEX </METHOD> 
+            <ORDER> 3 </ORDER> 
+        </TIMEINTEGRATIONSCHEME>
+
         <PARAMETERS>
             <P> TimeStep      = 0.001 </P>
             <P> NumSteps      = 1000    </P>
diff --git a/events/2011/Cambridge-AIM/Channel/Stability/Channel_Coupled.xml b/events/2011/Cambridge-AIM/Channel/Stability/Channel_Coupled.xml
index 6f9499374a04d355bf368bb810036084a5bc40c5..3636922b39053d945eda8afd14851229595f1adc 100644
--- a/events/2011/Cambridge-AIM/Channel/Stability/Channel_Coupled.xml
+++ b/events/2011/Cambridge-AIM/Channel/Stability/Channel_Coupled.xml
@@ -247,12 +247,16 @@
             <I PROPERTY="EQTYPE" VALUE="......"/>
             <I PROPERTY="EvolutionOperator" VALUE="Direct" />
             <I PROPERTY="Projection" VALUE="Galerkin"/>
-            <I PROPERTY="TimeIntegrationMethod" VALUE="IMEXOrder1"/>
             <I PROPERTY="Driver" VALUE="...."/>
             <I PROPERTY="InitialVector" VALUE="Random"/>
             <I PROPERTY="ArpackProblemType" VALUE="...."/>
         </SOLVERINFO>
 
+        <TIMEINTEGRATIONSCHEME> 
+            <METHOD> IMEX </METHOD> 
+            <ORDER> 1 </ORDER> 
+        </TIMEINTEGRATIONSCHEME>
+
         <PARAMETERS>
             <P> TimeStep      = 0.002 </P>
             <P> NumSteps      = 500    </P>
diff --git a/events/2011/Cambridge-AIM/Channel/Stability/Channel_VCS.xml b/events/2011/Cambridge-AIM/Channel/Stability/Channel_VCS.xml
index 01ca4ac9c5be9025030298337c114b94c7b34f71..721b751da88e218eeb2ee101de0845fbd3313192 100644
--- a/events/2011/Cambridge-AIM/Channel/Stability/Channel_VCS.xml
+++ b/events/2011/Cambridge-AIM/Channel/Stability/Channel_VCS.xml
@@ -247,10 +247,14 @@
             <I PROPERTY="EQTYPE" VALUE="UnsteadyNavierStokes"/>
             <I PROPERTY="EvolutionOperator" VALUE="Direct"/>
             <I PROPERTY="Projection" VALUE="Galerkin"/>
-            <I PROPERTY="TimeIntegrationMethod" VALUE="IMEXOrder3"/>
             <I PROPERTY="Driver" VALUE="ModifiedArnoldi"/>
         </SOLVERINFO>
 
+        <TIMEINTEGRATIONSCHEME> 
+            <METHOD> IMEX </METHOD> 
+            <ORDER> 3 </ORDER> 
+        </TIMEINTEGRATIONSCHEME>
+
         <PARAMETERS>
             <P> TimeStep      = 0.002  </P>
             <P> NumSteps      = 500     </P>
diff --git a/events/2011/Cambridge-AIM/Cylinder/Base/Cylinder-Base.xml b/events/2011/Cambridge-AIM/Cylinder/Base/Cylinder-Base.xml
index 748385fc9345a281c73f109a2d3f80b50c8e6372..893b872027b2aeaccc0031e6ba8f5d438db9a292 100644
--- a/events/2011/Cambridge-AIM/Cylinder/Base/Cylinder-Base.xml
+++ b/events/2011/Cambridge-AIM/Cylinder/Base/Cylinder-Base.xml
@@ -3446,10 +3446,14 @@
             <I PROPERTY="SOLVERTYPE" VALUE="VelocityCorrectionScheme"/>
             <I PROPERTY="EQTYPE" VALUE="UnsteadyNavierStokes"/>
             <I PROPERTY="EvolutionOperator" VALUE="Direct"/>
-            <I PROPERTY="TimeIntegrationMethod" VALUE="IMEXOrder2"/>
             <I PROPERTY="Driver" VALUE="Standard" />
         </SOLVERINFO>
 
+        <TIMEINTEGRATIONSCHEME> 
+            <METHOD> IMEX </METHOD> 
+            <ORDER> 2 </ORDER> 
+        </TIMEINTEGRATIONSCHEME>
+
         <PARAMETERS>
             <P> TimeStep      = 0.0008 </P>
             <P> NumSteps      = 625000 </P>
diff --git a/events/2011/Cambridge-AIM/Cylinder/Stability/Adjoint/Cylinder_Adjoint.xml b/events/2011/Cambridge-AIM/Cylinder/Stability/Adjoint/Cylinder_Adjoint.xml
index 066d8146f1cab8bd01ec0455a2a6b15a1a441142..e70eaa0425303b86345bf493f818d4af757e3d7c 100644
--- a/events/2011/Cambridge-AIM/Cylinder/Stability/Adjoint/Cylinder_Adjoint.xml
+++ b/events/2011/Cambridge-AIM/Cylinder/Stability/Adjoint/Cylinder_Adjoint.xml
@@ -3447,11 +3447,15 @@
             <I PROPERTY="EQTYPE" VALUE="UnsteadyNavierStokes"/>
             <I PROPERTY="EvolutionOperator" VALUE="......"/>
             <I PROPERTY="Projection" VALUE="Galerkin"/>
-            <I PROPERTY="TimeIntegrationMethod" VALUE="IMEXOrder2"/>
             <I PROPERTY="Driver" VALUE="Arpack" />
             <I PROPERTY="ArpackProblemType" VALUE="LargestMag" />
         </SOLVERINFO>
 
+        <TIMEINTEGRATIONSCHEME> 
+            <METHOD> IMEX </METHOD> 
+            <ORDER> 2 </ORDER> 
+        </TIMEINTEGRATIONSCHEME>
+
         <PARAMETERS>
             <P> TimeStep      = 0.0008 </P>
             <P> NumSteps      = 1250 </P>
diff --git a/events/2011/Cambridge-AIM/Cylinder/Stability/Direct/Cylinder_Direct.xml b/events/2011/Cambridge-AIM/Cylinder/Stability/Direct/Cylinder_Direct.xml
index 200a983864a0e20752ebbab56577a093d3c8b223..2b160f74ded072c4e233510117434ccc608f1487 100644
--- a/events/2011/Cambridge-AIM/Cylinder/Stability/Direct/Cylinder_Direct.xml
+++ b/events/2011/Cambridge-AIM/Cylinder/Stability/Direct/Cylinder_Direct.xml
@@ -3447,11 +3447,15 @@
             <I PROPERTY="EQTYPE" VALUE="UnsteadyNavierStokes"/>
             <I PROPERTY="EvolutionOperator" VALUE="Direct"/>
             <I PROPERTY="Projection" VALUE="Galerkin"/>
-            <I PROPERTY="TimeIntegrationMethod" VALUE="IMEXOrder2"/>
             <I PROPERTY="Driver" VALUE="ModifiedArnoldi" />
             <I PROPERTY="ArpackProblemType" VALUE="LargestMag" />
         </SOLVERINFO>
 
+        <TIMEINTEGRATIONSCHEME> 
+            <METHOD> IMEX </METHOD> 
+            <ORDER> 2 </ORDER> 
+        </TIMEINTEGRATIONSCHEME>
+
         <PARAMETERS>
             <P> TimeStep      = 0.0008 </P>
             <P> NumSteps      = 1250 </P>
diff --git a/events/2011/Cambridge-AIM/Cylinder/Stability/Receptivity/Cylinder_Direct.xml b/events/2011/Cambridge-AIM/Cylinder/Stability/Receptivity/Cylinder_Direct.xml
index ceb7b0cb7338f39cd5fd99a07d6f7a0c4823579b..0222558d952df5c832478d1c6a095f01c6f3fcc4 100644
--- a/events/2011/Cambridge-AIM/Cylinder/Stability/Receptivity/Cylinder_Direct.xml
+++ b/events/2011/Cambridge-AIM/Cylinder/Stability/Receptivity/Cylinder_Direct.xml
@@ -3447,11 +3447,15 @@
             <I PROPERTY="EQTYPE" VALUE="UnsteadyNavierStokes"/>
             <I PROPERTY="EvolutionOperator" VALUE="Direct"/>
             <I PROPERTY="Projection" VALUE="Galerkin"/>
-            <I PROPERTY="TimeIntegrationMethod" VALUE="IMEXOrder2"/>
             <I PROPERTY="Driver" VALUE="Arpack" />
             <I PROPERTY="ArpackProblemType" VALUE="LargestMag" />
         </SOLVERINFO>
 
+        <TIMEINTEGRATIONSCHEME> 
+            <METHOD> IMEX </METHOD> 
+            <ORDER> 2 </ORDER> 
+        </TIMEINTEGRATIONSCHEME>
+
         <PARAMETERS>
             <P> TimeStep      = 0.0008 </P>
             <P> NumSteps      = 1250 </P>
@@ -3461,8 +3465,6 @@
             <P> Kinvis         =1./Re   </P>
             <P> nvec           =2   </P>
             <P> evtol          =1e-5</P>
-
-
         </PARAMETERS>
 
         <VARIABLES>
diff --git a/events/2011/Cambridge-AIM/NekTutorial-def/Channel/Base/Channel-Base.xml b/events/2011/Cambridge-AIM/NekTutorial-def/Channel/Base/Channel-Base.xml
index f464700b5b3680a02b3932d863785777be771658..601fb43a5c6602a499f10bcf1767733d2693d6f1 100644
--- a/events/2011/Cambridge-AIM/NekTutorial-def/Channel/Base/Channel-Base.xml
+++ b/events/2011/Cambridge-AIM/NekTutorial-def/Channel/Base/Channel-Base.xml
@@ -6,10 +6,14 @@
             <I PROPERTY="EQTYPE" VALUE="........."/>
             <I PROPERTY="EvolutionOperator" VALUE="........."/>
             <I PROPERTY="Projection" VALUE=".........."/>
-            <I PROPERTY="TimeIntegrationMethod" VALUE="IMEXOrder3"/>
             <I PROPERTY="Driver" VALUE="........."/>
         </SOLVERINFO>
 
+        <TIMEINTEGRATIONSCHEME> 
+            <METHOD> IMEX </METHOD> 
+            <ORDER> 3 </ORDER> 
+        </TIMEINTEGRATIONSCHEME>
+
         <PARAMETERS>
             <P> TimeStep      = 0.001 </P>
             <P> NumSteps      = 1000    </P>
diff --git a/events/2011/Cambridge-AIM/NekTutorial-def/Channel/Stability/Channel_Coupled.xml b/events/2011/Cambridge-AIM/NekTutorial-def/Channel/Stability/Channel_Coupled.xml
index 75b81852892994a05d7f332900a858145f6e803f..d4a8261aff55e76cd7b54a8d05e0e719118f0016 100644
--- a/events/2011/Cambridge-AIM/NekTutorial-def/Channel/Stability/Channel_Coupled.xml
+++ b/events/2011/Cambridge-AIM/NekTutorial-def/Channel/Stability/Channel_Coupled.xml
@@ -247,12 +247,16 @@
             <I PROPERTY="EQTYPE" VALUE="......"/>
             <I PROPERTY="EvolutionOperator" VALUE="Direct" />
             <I PROPERTY="Projection" VALUE="Galerkin"/>
-            <I PROPERTY="TimeIntegrationMethod" VALUE="IMEXOrder1"/>
             <I PROPERTY="Driver" VALUE="...."/>
             <I PROPERTY="InitialVector" VALUE="......"/>
             <I PROPERTY="ArpackProblemType" VALUE="...."/>
         </SOLVERINFO>
 
+        <TIMEINTEGRATIONSCHEME> 
+            <METHOD> IMEX </METHOD> 
+            <ORDER> 1 </ORDER> 
+        </TIMEINTEGRATIONSCHEME>
+
         <PARAMETERS>
             <P> TimeStep      = 0.002 </P>
             <P> NumSteps      = 500    </P>
diff --git a/events/2011/Cambridge-AIM/NekTutorial-def/Channel/Stability/Channel_VCS.xml b/events/2011/Cambridge-AIM/NekTutorial-def/Channel/Stability/Channel_VCS.xml
index af93b07692e329c9996e5e4926e5e8d1f6181a4c..1c479379bf00df36ce19097f22179e02af0e4940 100644
--- a/events/2011/Cambridge-AIM/NekTutorial-def/Channel/Stability/Channel_VCS.xml
+++ b/events/2011/Cambridge-AIM/NekTutorial-def/Channel/Stability/Channel_VCS.xml
@@ -247,13 +247,15 @@
             <I PROPERTY="EQTYPE" VALUE="UnsteadyNavierStokes"/>
             <I PROPERTY="EvolutionOperator" VALUE="......"/>
             <I PROPERTY="Projection" VALUE="Galerkin"/>
-            <I PROPERTY="TimeIntegrationMethod" VALUE="IMEXOrder3"/>
             <I PROPERTY="Driver" VALUE="......"/>
             <I PROPERTY="ArpackProblemType" VALUE="......"/>
-
-
         </SOLVERINFO>
 
+        <TIMEINTEGRATIONSCHEME> 
+            <METHOD> IMEX </METHOD> 
+            <ORDER> 3 </ORDER> 
+        </TIMEINTEGRATIONSCHEME>
+
         <PARAMETERS>
             <P> TimeStep      = 0.002  </P>
             <P> NumSteps      = 500     </P>
diff --git a/events/2011/Cambridge-AIM/NekTutorial-def/Cylinder/Base/Cylinder-Base.xml b/events/2011/Cambridge-AIM/NekTutorial-def/Cylinder/Base/Cylinder-Base.xml
index 748385fc9345a281c73f109a2d3f80b50c8e6372..893b872027b2aeaccc0031e6ba8f5d438db9a292 100644
--- a/events/2011/Cambridge-AIM/NekTutorial-def/Cylinder/Base/Cylinder-Base.xml
+++ b/events/2011/Cambridge-AIM/NekTutorial-def/Cylinder/Base/Cylinder-Base.xml
@@ -3446,10 +3446,14 @@
             <I PROPERTY="SOLVERTYPE" VALUE="VelocityCorrectionScheme"/>
             <I PROPERTY="EQTYPE" VALUE="UnsteadyNavierStokes"/>
             <I PROPERTY="EvolutionOperator" VALUE="Direct"/>
-            <I PROPERTY="TimeIntegrationMethod" VALUE="IMEXOrder2"/>
             <I PROPERTY="Driver" VALUE="Standard" />
         </SOLVERINFO>
 
+        <TIMEINTEGRATIONSCHEME> 
+            <METHOD> IMEX </METHOD> 
+            <ORDER> 2 </ORDER> 
+        </TIMEINTEGRATIONSCHEME>
+
         <PARAMETERS>
             <P> TimeStep      = 0.0008 </P>
             <P> NumSteps      = 625000 </P>
diff --git a/events/2011/Cambridge-AIM/NekTutorial-def/Cylinder/Stability/Adjoint/Cylinder_Adjoint.xml b/events/2011/Cambridge-AIM/NekTutorial-def/Cylinder/Stability/Adjoint/Cylinder_Adjoint.xml
index 06ef850f2497bf82ffa5a3eafa02732834b59e9a..901254ff451359e3dde9f6b9673d622f9010a9a5 100644
--- a/events/2011/Cambridge-AIM/NekTutorial-def/Cylinder/Stability/Adjoint/Cylinder_Adjoint.xml
+++ b/events/2011/Cambridge-AIM/NekTutorial-def/Cylinder/Stability/Adjoint/Cylinder_Adjoint.xml
@@ -3447,11 +3447,15 @@
             <I PROPERTY="EQTYPE" VALUE="UnsteadyNavierStokes"/>
             <I PROPERTY="EvolutionOperator" VALUE="....."/>
             <I PROPERTY="Projection" VALUE="Galerkin"/>
-            <I PROPERTY="TimeIntegrationMethod" VALUE="IMEXOrder2"/>
             <I PROPERTY="Driver" VALUE="Arpack" />
             <I PROPERTY="ArpackProblemType" VALUE="LargestMag" />
         </SOLVERINFO>
 
+        <TIMEINTEGRATIONSCHEME> 
+            <METHOD> IMEX </METHOD> 
+            <ORDER> 2 </ORDER> 
+        </TIMEINTEGRATIONSCHEME>
+
         <PARAMETERS>
             <P> TimeStep      = 0.0008 </P>
             <P> NumSteps      = 500 </P>
diff --git a/events/2011/Cambridge-AIM/NekTutorial-def/Cylinder/Stability/Direct/Cylinder_Direct.xml b/events/2011/Cambridge-AIM/NekTutorial-def/Cylinder/Stability/Direct/Cylinder_Direct.xml
index 2356e541664465633bda0891979cc508ed6c87c5..b85a6382d1a4e5fba83e538cc3899cc86d1fcdc7 100644
--- a/events/2011/Cambridge-AIM/NekTutorial-def/Cylinder/Stability/Direct/Cylinder_Direct.xml
+++ b/events/2011/Cambridge-AIM/NekTutorial-def/Cylinder/Stability/Direct/Cylinder_Direct.xml
@@ -3447,11 +3447,15 @@
             <I PROPERTY="EQTYPE" VALUE="UnsteadyNavierStokes"/>
             <I PROPERTY="EvolutionOperator" VALUE="Direct"/>
             <I PROPERTY="Projection" VALUE="Galerkin"/>
-            <I PROPERTY="TimeIntegrationMethod" VALUE="IMEXOrder2"/>
             <I PROPERTY="Driver" VALUE="Arpack" />
             <I PROPERTY="ArpackProblemType" VALUE="LargestMag" />
         </SOLVERINFO>
 
+        <TIMEINTEGRATIONSCHEME> 
+            <METHOD> IMEX </METHOD> 
+            <ORDER> 2 </ORDER> 
+        </TIMEINTEGRATIONSCHEME>
+
         <PARAMETERS>
             <P> TimeStep      = 0.0008 </P>
             <P> NumSteps      = 500 </P>
diff --git a/events/2011/Cambridge-AIM/NekTutorial-def/backward-facing_step/Base/bfs-Base.xml b/events/2011/Cambridge-AIM/NekTutorial-def/backward-facing_step/Base/bfs-Base.xml
index cebd009b3d5aa43ad4bda339ab647a3cbb427057..755b57542b11962d63bcd25fd71e89fb0432510f 100644
--- a/events/2011/Cambridge-AIM/NekTutorial-def/backward-facing_step/Base/bfs-Base.xml
+++ b/events/2011/Cambridge-AIM/NekTutorial-def/backward-facing_step/Base/bfs-Base.xml
@@ -1684,11 +1684,15 @@
             <I PROPERTY="EQTYPE" VALUE="UnsteadyNavierStokes"/>
             <I PROPERTY="AdvectionForm" VALUE="Convective"/>
             <I PROPERTY="Projection"    VALUE="Galerkin"/>
-            <I PROPERTY="TimeIntegrationMethod" VALUE="IMEXOrder2"/>
             <I PROPERTY="SOLVERTYPE" VALUE="VelocityCorrectionScheme"/>
             <I PROPERTY="Driver" VALUE="Standard"/>
         </SOLVERINFO>
 
+        <TIMEINTEGRATIONSCHEME> 
+            <METHOD> IMEX </METHOD> 
+            <ORDER> 2 </ORDER> 
+        </TIMEINTEGRATIONSCHEME>
+
         <PARAMETERS>
             <P> TimeStep      = 0.002     </P>
             <P> NumSteps      = 400000       </P>
diff --git a/events/2011/Cambridge-AIM/NekTutorial-def/backward-facing_step/Stability/bfs_tg.xml b/events/2011/Cambridge-AIM/NekTutorial-def/backward-facing_step/Stability/bfs_tg.xml
index e389f6795937c57821bd13b9ca635052c13d9dc5..76b949625cd5ee4ee204f82cde0d603f685d3740 100644
--- a/events/2011/Cambridge-AIM/NekTutorial-def/backward-facing_step/Stability/bfs_tg.xml
+++ b/events/2011/Cambridge-AIM/NekTutorial-def/backward-facing_step/Stability/bfs_tg.xml
@@ -1685,14 +1685,16 @@
             <I PROPERTY="EQTYPE" VALUE="UnsteadyNavierStokes"/>
             <I PROPERTY="EvolutionOperator" VALUE="......."/>
             <I PROPERTY="Projection"    VALUE="Galerkin"/>
-            <I PROPERTY="TimeIntegrationMethod" VALUE="IMEXOrder2"/>
             <I PROPERTY="SOLVERTYPE" VALUE="VelocityCorrectionScheme"/>
             <I PROPERTY="Driver" VALUE="Arpack"/>
             <I PROPERTY="ArpackProblemType" VALUE="LargestMag"/>
-
-
         </SOLVERINFO>
 
+        <TIMEINTEGRATIONSCHEME> 
+            <METHOD> IMEX </METHOD> 
+            <ORDER> 2 </ORDER> 
+        </TIMEINTEGRATIONSCHEME>
+
         <PARAMETERS>
             <P> TimeStep      = 0.002     </P>
             <P> IO_CheckSteps = 1/TimeStep       </P>
diff --git a/events/2011/Cambridge-AIM/backward-facing_step/Base/bfs-Base.xml b/events/2011/Cambridge-AIM/backward-facing_step/Base/bfs-Base.xml
index cebd009b3d5aa43ad4bda339ab647a3cbb427057..755b57542b11962d63bcd25fd71e89fb0432510f 100644
--- a/events/2011/Cambridge-AIM/backward-facing_step/Base/bfs-Base.xml
+++ b/events/2011/Cambridge-AIM/backward-facing_step/Base/bfs-Base.xml
@@ -1684,11 +1684,15 @@
             <I PROPERTY="EQTYPE" VALUE="UnsteadyNavierStokes"/>
             <I PROPERTY="AdvectionForm" VALUE="Convective"/>
             <I PROPERTY="Projection"    VALUE="Galerkin"/>
-            <I PROPERTY="TimeIntegrationMethod" VALUE="IMEXOrder2"/>
             <I PROPERTY="SOLVERTYPE" VALUE="VelocityCorrectionScheme"/>
             <I PROPERTY="Driver" VALUE="Standard"/>
         </SOLVERINFO>
 
+        <TIMEINTEGRATIONSCHEME> 
+            <METHOD> IMEX </METHOD> 
+            <ORDER> 2 </ORDER> 
+        </TIMEINTEGRATIONSCHEME>
+
         <PARAMETERS>
             <P> TimeStep      = 0.002     </P>
             <P> NumSteps      = 400000       </P>
diff --git a/events/2011/Cambridge-AIM/backward-facing_step/Stability/bfs_tg.xml b/events/2011/Cambridge-AIM/backward-facing_step/Stability/bfs_tg.xml
index 649c072fad65656d0e29d24cd571705d2d609a18..961de5b2b352c24d67efb058da87ff0b91430979 100644
--- a/events/2011/Cambridge-AIM/backward-facing_step/Stability/bfs_tg.xml
+++ b/events/2011/Cambridge-AIM/backward-facing_step/Stability/bfs_tg.xml
@@ -1685,14 +1685,16 @@
             <I PROPERTY="EQTYPE" VALUE="UnsteadyNavierStokes"/>
             <I PROPERTY="EvolutionOperator" VALUE="......."/>
             <I PROPERTY="Projection"    VALUE="Galerkin"/>
-            <I PROPERTY="TimeIntegrationMethod" VALUE="IMEXOrder2"/>
             <I PROPERTY="SOLVERTYPE" VALUE="VelocityCorrectionScheme"/>
             <I PROPERTY="Driver" VALUE="Arpack"/>
             <I PROPERTY="ArpackProblemType" VALUE="LargestMag"/>
-
-
         </SOLVERINFO>
 
+        <TIMEINTEGRATIONSCHEME> 
+            <METHOD> IMEX </METHOD> 
+            <ORDER> 2 </ORDER> 
+        </TIMEINTEGRATIONSCHEME>
+
         <PARAMETERS>
             <P> TimeStep      = 0.002     </P>
             <P> IO_CheckSteps = 1/TimeStep       </P>
diff --git a/events/2011/Cambridge-AIM/bfs-cc-tg.xml b/events/2011/Cambridge-AIM/bfs-cc-tg.xml
index 87e0eabec52ba10b62c33abc2e197cf598370ae5..3ded5c087b4ad008a445dbce12deab6f6cc793da 100644
--- a/events/2011/Cambridge-AIM/bfs-cc-tg.xml
+++ b/events/2011/Cambridge-AIM/bfs-cc-tg.xml
@@ -1684,15 +1684,17 @@
             <I PROPERTY="EQTYPE" VALUE="UnsteadyNavierStokes"/>
             <I PROPERTY="EvolutionOperator" VALUE="TransientGrowth"/>
             <I PROPERTY="Projection"    VALUE="Galerkin"/>
-            <I PROPERTY="TimeIntegrationMethod" VALUE="IMEXOrder2"/>
             <I PROPERTY="SOLVERTYPE" VALUE="VelocityCorrectionScheme"/>
             <I PROPERTY="Driver" VALUE="Arpack"/>
             <I PROPERTY="InitialVector" VALUE="Random"/>
             <I PROPERTY="ArpackProblemType" VALUE="LargestMag"/>
-
-
         </SOLVERINFO>
 
+        <TIMEINTEGRATIONSCHEME> 
+            <METHOD> IMEX </METHOD> 
+            <ORDER> 2 </ORDER> 
+        </TIMEINTEGRATIONSCHEME>
+
         <PARAMETERS>
             <P> FinalTime   = 1 </P>
             <P> TimeStep      = 0.002     </P>
diff --git a/events/2011/Cambridge-AIM/bfs-cc.xml b/events/2011/Cambridge-AIM/bfs-cc.xml
index cebd009b3d5aa43ad4bda339ab647a3cbb427057..755b57542b11962d63bcd25fd71e89fb0432510f 100644
--- a/events/2011/Cambridge-AIM/bfs-cc.xml
+++ b/events/2011/Cambridge-AIM/bfs-cc.xml
@@ -1684,11 +1684,15 @@
             <I PROPERTY="EQTYPE" VALUE="UnsteadyNavierStokes"/>
             <I PROPERTY="AdvectionForm" VALUE="Convective"/>
             <I PROPERTY="Projection"    VALUE="Galerkin"/>
-            <I PROPERTY="TimeIntegrationMethod" VALUE="IMEXOrder2"/>
             <I PROPERTY="SOLVERTYPE" VALUE="VelocityCorrectionScheme"/>
             <I PROPERTY="Driver" VALUE="Standard"/>
         </SOLVERINFO>
 
+        <TIMEINTEGRATIONSCHEME> 
+            <METHOD> IMEX </METHOD> 
+            <ORDER> 2 </ORDER> 
+        </TIMEINTEGRATIONSCHEME>
+
         <PARAMETERS>
             <P> TimeStep      = 0.002     </P>
             <P> NumSteps      = 400000       </P>
diff --git a/events/2011/Cambridge-AIM/nektutorial/Channel/Base/Channel-Base.xml b/events/2011/Cambridge-AIM/nektutorial/Channel/Base/Channel-Base.xml
index f2a589efa0815fe4900cddebf71df437c8f58fae..de249df3382e4f6727e31c5fc9b70c13e6568ff8 100644
--- a/events/2011/Cambridge-AIM/nektutorial/Channel/Base/Channel-Base.xml
+++ b/events/2011/Cambridge-AIM/nektutorial/Channel/Base/Channel-Base.xml
@@ -6,12 +6,14 @@
             <I PROPERTY="EQTYPE" VALUE="........."/>
             <I PROPERTY="EvolutionOperator" VALUE="........."/>
             <I PROPERTY="Projection" VALUE=".........."/>
-            <I PROPERTY="TimeIntegrationMethod" VALUE="IMEXOrder3"/>
             <I PROPERTY="Driver" VALUE="........."/>
-
-
         </SOLVERINFO>
 
+        <TIMEINTEGRATIONSCHEME> 
+            <METHOD> IMEX </METHOD> 
+            <ORDER> 3 </ORDER> 
+        </TIMEINTEGRATIONSCHEME>
+
         <PARAMETERS>
             <P> TimeStep      = 0.001 </P>
             <P> NumSteps      = 1000    </P>
diff --git a/events/2011/Cambridge-AIM/nektutorial/Channel/Stability/Channel_Coupled.xml b/events/2011/Cambridge-AIM/nektutorial/Channel/Stability/Channel_Coupled.xml
index 75b81852892994a05d7f332900a858145f6e803f..d4a8261aff55e76cd7b54a8d05e0e719118f0016 100644
--- a/events/2011/Cambridge-AIM/nektutorial/Channel/Stability/Channel_Coupled.xml
+++ b/events/2011/Cambridge-AIM/nektutorial/Channel/Stability/Channel_Coupled.xml
@@ -247,12 +247,16 @@
             <I PROPERTY="EQTYPE" VALUE="......"/>
             <I PROPERTY="EvolutionOperator" VALUE="Direct" />
             <I PROPERTY="Projection" VALUE="Galerkin"/>
-            <I PROPERTY="TimeIntegrationMethod" VALUE="IMEXOrder1"/>
             <I PROPERTY="Driver" VALUE="...."/>
             <I PROPERTY="InitialVector" VALUE="......"/>
             <I PROPERTY="ArpackProblemType" VALUE="...."/>
         </SOLVERINFO>
 
+        <TIMEINTEGRATIONSCHEME> 
+            <METHOD> IMEX </METHOD> 
+            <ORDER> 1 </ORDER> 
+        </TIMEINTEGRATIONSCHEME>
+
         <PARAMETERS>
             <P> TimeStep      = 0.002 </P>
             <P> NumSteps      = 500    </P>
diff --git a/events/2011/Cambridge-AIM/nektutorial/Channel/Stability/Channel_VCS.xml b/events/2011/Cambridge-AIM/nektutorial/Channel/Stability/Channel_VCS.xml
index af93b07692e329c9996e5e4926e5e8d1f6181a4c..1c479379bf00df36ce19097f22179e02af0e4940 100644
--- a/events/2011/Cambridge-AIM/nektutorial/Channel/Stability/Channel_VCS.xml
+++ b/events/2011/Cambridge-AIM/nektutorial/Channel/Stability/Channel_VCS.xml
@@ -247,13 +247,15 @@
             <I PROPERTY="EQTYPE" VALUE="UnsteadyNavierStokes"/>
             <I PROPERTY="EvolutionOperator" VALUE="......"/>
             <I PROPERTY="Projection" VALUE="Galerkin"/>
-            <I PROPERTY="TimeIntegrationMethod" VALUE="IMEXOrder3"/>
             <I PROPERTY="Driver" VALUE="......"/>
             <I PROPERTY="ArpackProblemType" VALUE="......"/>
-
-
         </SOLVERINFO>
 
+        <TIMEINTEGRATIONSCHEME> 
+            <METHOD> IMEX </METHOD> 
+            <ORDER> 3 </ORDER> 
+        </TIMEINTEGRATIONSCHEME>
+
         <PARAMETERS>
             <P> TimeStep      = 0.002  </P>
             <P> NumSteps      = 500     </P>
diff --git a/events/2011/Cambridge-AIM/nektutorial/Cylinder/Base/Cylinder-Base.xml b/events/2011/Cambridge-AIM/nektutorial/Cylinder/Base/Cylinder-Base.xml
index 748385fc9345a281c73f109a2d3f80b50c8e6372..893b872027b2aeaccc0031e6ba8f5d438db9a292 100644
--- a/events/2011/Cambridge-AIM/nektutorial/Cylinder/Base/Cylinder-Base.xml
+++ b/events/2011/Cambridge-AIM/nektutorial/Cylinder/Base/Cylinder-Base.xml
@@ -3446,10 +3446,14 @@
             <I PROPERTY="SOLVERTYPE" VALUE="VelocityCorrectionScheme"/>
             <I PROPERTY="EQTYPE" VALUE="UnsteadyNavierStokes"/>
             <I PROPERTY="EvolutionOperator" VALUE="Direct"/>
-            <I PROPERTY="TimeIntegrationMethod" VALUE="IMEXOrder2"/>
             <I PROPERTY="Driver" VALUE="Standard" />
         </SOLVERINFO>
 
+        <TIMEINTEGRATIONSCHEME> 
+            <METHOD> IMEX </METHOD> 
+            <ORDER> 2 </ORDER> 
+        </TIMEINTEGRATIONSCHEME>
+
         <PARAMETERS>
             <P> TimeStep      = 0.0008 </P>
             <P> NumSteps      = 625000 </P>
diff --git a/events/2011/Cambridge-AIM/nektutorial/Cylinder/Stability/Adjoint/Cylinder_Adjoint.xml b/events/2011/Cambridge-AIM/nektutorial/Cylinder/Stability/Adjoint/Cylinder_Adjoint.xml
index 06ef850f2497bf82ffa5a3eafa02732834b59e9a..901254ff451359e3dde9f6b9673d622f9010a9a5 100644
--- a/events/2011/Cambridge-AIM/nektutorial/Cylinder/Stability/Adjoint/Cylinder_Adjoint.xml
+++ b/events/2011/Cambridge-AIM/nektutorial/Cylinder/Stability/Adjoint/Cylinder_Adjoint.xml
@@ -3447,11 +3447,15 @@
             <I PROPERTY="EQTYPE" VALUE="UnsteadyNavierStokes"/>
             <I PROPERTY="EvolutionOperator" VALUE="....."/>
             <I PROPERTY="Projection" VALUE="Galerkin"/>
-            <I PROPERTY="TimeIntegrationMethod" VALUE="IMEXOrder2"/>
             <I PROPERTY="Driver" VALUE="Arpack" />
             <I PROPERTY="ArpackProblemType" VALUE="LargestMag" />
         </SOLVERINFO>
 
+        <TIMEINTEGRATIONSCHEME> 
+            <METHOD> IMEX </METHOD> 
+            <ORDER> 2 </ORDER> 
+        </TIMEINTEGRATIONSCHEME>
+
         <PARAMETERS>
             <P> TimeStep      = 0.0008 </P>
             <P> NumSteps      = 500 </P>
diff --git a/events/2011/Cambridge-AIM/nektutorial/Cylinder/Stability/Direct/Cylinder_Direct.xml b/events/2011/Cambridge-AIM/nektutorial/Cylinder/Stability/Direct/Cylinder_Direct.xml
index 2356e541664465633bda0891979cc508ed6c87c5..b85a6382d1a4e5fba83e538cc3899cc86d1fcdc7 100644
--- a/events/2011/Cambridge-AIM/nektutorial/Cylinder/Stability/Direct/Cylinder_Direct.xml
+++ b/events/2011/Cambridge-AIM/nektutorial/Cylinder/Stability/Direct/Cylinder_Direct.xml
@@ -3447,11 +3447,15 @@
             <I PROPERTY="EQTYPE" VALUE="UnsteadyNavierStokes"/>
             <I PROPERTY="EvolutionOperator" VALUE="Direct"/>
             <I PROPERTY="Projection" VALUE="Galerkin"/>
-            <I PROPERTY="TimeIntegrationMethod" VALUE="IMEXOrder2"/>
             <I PROPERTY="Driver" VALUE="Arpack" />
             <I PROPERTY="ArpackProblemType" VALUE="LargestMag" />
         </SOLVERINFO>
 
+        <TIMEINTEGRATIONSCHEME> 
+            <METHOD> IMEX </METHOD> 
+            <ORDER> 2 </ORDER> 
+        </TIMEINTEGRATIONSCHEME>
+
         <PARAMETERS>
             <P> TimeStep      = 0.0008 </P>
             <P> NumSteps      = 500 </P>
diff --git a/events/2011/Cambridge-AIM/nektutorial/backward-facing_step/Base/bfs-Base.xml b/events/2011/Cambridge-AIM/nektutorial/backward-facing_step/Base/bfs-Base.xml
index cebd009b3d5aa43ad4bda339ab647a3cbb427057..755b57542b11962d63bcd25fd71e89fb0432510f 100644
--- a/events/2011/Cambridge-AIM/nektutorial/backward-facing_step/Base/bfs-Base.xml
+++ b/events/2011/Cambridge-AIM/nektutorial/backward-facing_step/Base/bfs-Base.xml
@@ -1684,11 +1684,15 @@
             <I PROPERTY="EQTYPE" VALUE="UnsteadyNavierStokes"/>
             <I PROPERTY="AdvectionForm" VALUE="Convective"/>
             <I PROPERTY="Projection"    VALUE="Galerkin"/>
-            <I PROPERTY="TimeIntegrationMethod" VALUE="IMEXOrder2"/>
             <I PROPERTY="SOLVERTYPE" VALUE="VelocityCorrectionScheme"/>
             <I PROPERTY="Driver" VALUE="Standard"/>
         </SOLVERINFO>
 
+        <TIMEINTEGRATIONSCHEME> 
+            <METHOD> IMEX </METHOD> 
+            <ORDER> 2 </ORDER> 
+        </TIMEINTEGRATIONSCHEME>
+
         <PARAMETERS>
             <P> TimeStep      = 0.002     </P>
             <P> NumSteps      = 400000       </P>
diff --git a/events/2011/Cambridge-AIM/nektutorial/backward-facing_step/Stability/bfs_tg.xml b/events/2011/Cambridge-AIM/nektutorial/backward-facing_step/Stability/bfs_tg.xml
index e389f6795937c57821bd13b9ca635052c13d9dc5..76b949625cd5ee4ee204f82cde0d603f685d3740 100644
--- a/events/2011/Cambridge-AIM/nektutorial/backward-facing_step/Stability/bfs_tg.xml
+++ b/events/2011/Cambridge-AIM/nektutorial/backward-facing_step/Stability/bfs_tg.xml
@@ -1685,14 +1685,16 @@
             <I PROPERTY="EQTYPE" VALUE="UnsteadyNavierStokes"/>
             <I PROPERTY="EvolutionOperator" VALUE="......."/>
             <I PROPERTY="Projection"    VALUE="Galerkin"/>
-            <I PROPERTY="TimeIntegrationMethod" VALUE="IMEXOrder2"/>
             <I PROPERTY="SOLVERTYPE" VALUE="VelocityCorrectionScheme"/>
             <I PROPERTY="Driver" VALUE="Arpack"/>
             <I PROPERTY="ArpackProblemType" VALUE="LargestMag"/>
-
-
         </SOLVERINFO>
 
+        <TIMEINTEGRATIONSCHEME> 
+            <METHOD> IMEX </METHOD> 
+            <ORDER> 2 </ORDER> 
+        </TIMEINTEGRATIONSCHEME>
+
         <PARAMETERS>
             <P> TimeStep      = 0.002     </P>
             <P> IO_CheckSteps = 1/TimeStep       </P>
diff --git a/events/2015/Crete-SummerSchool/TutorialFiles/BackwardStep/Base/bfs-Base.xml b/events/2015/Crete-SummerSchool/TutorialFiles/BackwardStep/Base/bfs-Base.xml
index 910fc976ba0c2142f47ec78b728dbac3cc3c73b9..763251c75a0a9f6ce4ea796d10a1ee7ba9d40f0b 100644
--- a/events/2015/Crete-SummerSchool/TutorialFiles/BackwardStep/Base/bfs-Base.xml
+++ b/events/2015/Crete-SummerSchool/TutorialFiles/BackwardStep/Base/bfs-Base.xml
@@ -5,11 +5,15 @@
             <I PROPERTY="EQTYPE"                VALUE="UnsteadyNavierStokes"      />
             <I PROPERTY="AdvectionForm"         VALUE="Convective"                />
             <I PROPERTY="Projection"            VALUE="Galerkin"                  />
-            <I PROPERTY="TimeIntegrationMethod" VALUE="IMEXOrder2"                />
             <I PROPERTY="SOLVERTYPE"            VALUE="VelocityCorrectionScheme"  />
             <I PROPERTY="Driver"                VALUE="Standard"                  />
         </SOLVERINFO>
 
+        <TIMEINTEGRATIONSCHEME> 
+            <METHOD> IMEX </METHOD> 
+            <ORDER> 2 </ORDER> 
+        </TIMEINTEGRATIONSCHEME>
+
         <PARAMETERS>
             <P> TimeStep      = 0.002         </P>
             <P> NumSteps      = 400000        </P>
diff --git a/events/2015/Crete-SummerSchool/TutorialFiles/BackwardStep/Energy/bfs_energy_tau01.xml b/events/2015/Crete-SummerSchool/TutorialFiles/BackwardStep/Energy/bfs_energy_tau01.xml
index a46082b2966135ab89f120a4aab0f7eb9fe7c2f8..0d751f3618b509a6670cb560b49bd9df33c2ba0c 100644
--- a/events/2015/Crete-SummerSchool/TutorialFiles/BackwardStep/Energy/bfs_energy_tau01.xml
+++ b/events/2015/Crete-SummerSchool/TutorialFiles/BackwardStep/Energy/bfs_energy_tau01.xml
@@ -8,10 +8,14 @@
         <SOLVERINFO>
             <I PROPERTY="EQTYPE"                VALUE="UnsteadyNavierStokes"    />
             <I PROPERTY="Projection"            VALUE="Galerkin"                />
-            <I PROPERTY="TimeIntegrationMethod" VALUE="IMEXOrder2"              />
             <I PROPERTY="SOLVERTYPE"            VALUE="VelocityCorrectionScheme"/>
         </SOLVERINFO>
 
+        <TIMEINTEGRATIONSCHEME> 
+            <METHOD> IMEX </METHOD> 
+            <ORDER> 2 </ORDER> 
+        </TIMEINTEGRATIONSCHEME>
+
         <PARAMETERS>
             <P> TimeStep      = 0.002               </P>
             <P> FinalTime     = 70                  </P>
diff --git a/events/2015/Crete-SummerSchool/TutorialFiles/BackwardStep/Energy/bfs_energy_tau20.xml b/events/2015/Crete-SummerSchool/TutorialFiles/BackwardStep/Energy/bfs_energy_tau20.xml
index a46082b2966135ab89f120a4aab0f7eb9fe7c2f8..0d751f3618b509a6670cb560b49bd9df33c2ba0c 100644
--- a/events/2015/Crete-SummerSchool/TutorialFiles/BackwardStep/Energy/bfs_energy_tau20.xml
+++ b/events/2015/Crete-SummerSchool/TutorialFiles/BackwardStep/Energy/bfs_energy_tau20.xml
@@ -8,10 +8,14 @@
         <SOLVERINFO>
             <I PROPERTY="EQTYPE"                VALUE="UnsteadyNavierStokes"    />
             <I PROPERTY="Projection"            VALUE="Galerkin"                />
-            <I PROPERTY="TimeIntegrationMethod" VALUE="IMEXOrder2"              />
             <I PROPERTY="SOLVERTYPE"            VALUE="VelocityCorrectionScheme"/>
         </SOLVERINFO>
 
+        <TIMEINTEGRATIONSCHEME> 
+            <METHOD> IMEX </METHOD> 
+            <ORDER> 2 </ORDER> 
+        </TIMEINTEGRATIONSCHEME>
+
         <PARAMETERS>
             <P> TimeStep      = 0.002               </P>
             <P> FinalTime     = 70                  </P>
diff --git a/events/2015/Crete-SummerSchool/TutorialFiles/BackwardStep/Stability/bfs_tg.xml b/events/2015/Crete-SummerSchool/TutorialFiles/BackwardStep/Stability/bfs_tg.xml
index aa1bcd7a60e483e31545c9f7564bd7416e72e14b..f33b4ed024ad02331b37885f84701bc743b67ce5 100644
--- a/events/2015/Crete-SummerSchool/TutorialFiles/BackwardStep/Stability/bfs_tg.xml
+++ b/events/2015/Crete-SummerSchool/TutorialFiles/BackwardStep/Stability/bfs_tg.xml
@@ -8,16 +8,18 @@
         <SOLVERINFO>
             <I PROPERTY="EQTYPE"                VALUE="UnsteadyNavierStokes"    />
             <I PROPERTY="Projection"            VALUE="Galerkin"                />
-            <I PROPERTY="TimeIntegrationMethod" VALUE="IMEXOrder2"              />
             <I PROPERTY="SOLVERTYPE"            VALUE="VelocityCorrectionScheme"/>
             <I PROPERTY="Driver"                VALUE="Arpack"                  />
             <I PROPERTY="ArpackProblemType"     VALUE="LargestMag"              />
-            ...
         </SOLVERINFO>
 
+        <TIMEINTEGRATIONSCHEME> 
+            <METHOD> IMEX </METHOD> 
+            <ORDER> 2 </ORDER> 
+        </TIMEINTEGRATIONSCHEME>
+
         <PARAMETERS>
             <P> TimeStep      = 0.002               </P>
-            ...
             <P> IO_CheckSteps = 1/TimeStep          </P>
             <P> IO_InfoSteps  = 500                 </P>
             <P> Re            = 500                 </P>
diff --git a/events/2015/Crete-SummerSchool/TutorialFiles/Channel/Base/Channel-Base.xml b/events/2015/Crete-SummerSchool/TutorialFiles/Channel/Base/Channel-Base.xml
index e9102844a16e93075fdc88791bd9db800cdc861d..5e1e16bf8d93f8ce2af0bc2b3475ad5f45acd188 100644
--- a/events/2015/Crete-SummerSchool/TutorialFiles/Channel/Base/Channel-Base.xml
+++ b/events/2015/Crete-SummerSchool/TutorialFiles/Channel/Base/Channel-Base.xml
@@ -3,16 +3,18 @@
     <CONDITIONS>
         <SOLVERINFO>
             <I PROPERTY="SolverType"              VALUE="VelocityCorrectionScheme"/>
-            <I PROPERTY="TimeIntegrationMethod"   VALUE="IMEXOrder3"              />
-            ...
         </SOLVERINFO>
 
+        <TIMEINTEGRATIONSCHEME> 
+            <METHOD> IMEX </METHOD> 
+            <ORDER> 3 </ORDER> 
+        </TIMEINTEGRATIONSCHEME>
+
         <PARAMETERS>
             <P> TimeStep      = 0.001     </P>
             <P> NumSteps      = 1000      </P>
             <P> IO_CheckSteps = 500       </P>
             <P> IO_InfoSteps  = 100       </P>
-            ...
         </PARAMETERS>
 
         <VARIABLES>
diff --git a/events/2015/Crete-SummerSchool/TutorialFiles/Channel/Stability/VCS/Channel-VCS.xml b/events/2015/Crete-SummerSchool/TutorialFiles/Channel/Stability/VCS/Channel-VCS.xml
index 575eb7483a1f9f789a76e1ac20d28b30fc3f8d93..d5622c28aa00a03219befb591cd04b886c77ff1e 100644
--- a/events/2015/Crete-SummerSchool/TutorialFiles/Channel/Stability/VCS/Channel-VCS.xml
+++ b/events/2015/Crete-SummerSchool/TutorialFiles/Channel/Stability/VCS/Channel-VCS.xml
@@ -5,10 +5,13 @@
             <I PROPERTY="SolverType"            VALUE="VelocityCorrectionScheme"/>
             <I PROPERTY="EQTYPE"                VALUE="UnsteadyNavierStokes"    />
             <I PROPERTY="Projection"            VALUE="Continuous"              />
-            <I PROPERTY="TimeIntegrationMethod" VALUE="IMEXOrder3"              />
-            ...
         </SOLVERINFO>
 
+        <TIMEINTEGRATIONSCHEME> 
+            <METHOD> IMEX </METHOD> 
+            <ORDER> 3 </ORDER> 
+        </TIMEINTEGRATIONSCHEME>
+
         <PARAMETERS>
             <P> TimeStep      = 0.001     </P>
             <P> NumSteps      = 500       </P>
@@ -16,7 +19,6 @@
             <P> IO_InfoSteps  = 20        </P>
             <P> Re            = 7500      </P>
             <P> Kinvis        = 1.0/Re    </P>
-            ...
         </PARAMETERS>
 
         <VARIABLES>
diff --git a/events/2015/Crete-SummerSchool/TutorialFiles/Cylinder/Base/Cylinder-Base.xml b/events/2015/Crete-SummerSchool/TutorialFiles/Cylinder/Base/Cylinder-Base.xml
index 553deeebb90b2992ff7c35ae4806df8bcf392693..3e142cb1d5ffe39d4f2b4d7219b41a517dc399f7 100644
--- a/events/2015/Crete-SummerSchool/TutorialFiles/Cylinder/Base/Cylinder-Base.xml
+++ b/events/2015/Crete-SummerSchool/TutorialFiles/Cylinder/Base/Cylinder-Base.xml
@@ -11,10 +11,14 @@
             <I PROPERTY="EQTYPE"                  VALUE="UnsteadyNavierStokes"    />
             <I PROPERTY="Projection"              VALUE="Continuous"              />
             <I PROPERTY="EvolutionOperator"       VALUE="Nonlinear"               />
-            <I PROPERTY="TimeIntegrationMethod"   VALUE="IMEXOrder2"              />
             <I PROPERTY="Driver"                  VALUE="Standard"                />
         </SOLVERINFO>
 
+        <TIMEINTEGRATIONSCHEME> 
+            <METHOD> IMEX </METHOD> 
+            <ORDER> 2 </ORDER> 
+        </TIMEINTEGRATIONSCHEME>
+
         <PARAMETERS>
             <P> TimeStep      = 0.0008    </P>
             <P> NumSteps      = 625000    </P>
diff --git a/events/2015/Crete-SummerSchool/TutorialFiles/Cylinder/Stability/Adjoint/Cylinder_Adjoint.xml b/events/2015/Crete-SummerSchool/TutorialFiles/Cylinder/Stability/Adjoint/Cylinder_Adjoint.xml
index d0980d9faefca7a2d8faf108a1a096a01ca17a01..bfdb09e8ced0b47b5122152ec5ccb5e18cf5ef49 100644
--- a/events/2015/Crete-SummerSchool/TutorialFiles/Cylinder/Stability/Adjoint/Cylinder_Adjoint.xml
+++ b/events/2015/Crete-SummerSchool/TutorialFiles/Cylinder/Stability/Adjoint/Cylinder_Adjoint.xml
@@ -6,11 +6,15 @@
             <I PROPERTY="EQTYPE"                VALUE="UnsteadyNavierStokes"    />
             <I PROPERTY="EvolutionOperator"     VALUE="..."                 />
             <I PROPERTY="Projection"            VALUE="Galerkin"                />
-            <I PROPERTY="TimeIntegrationMethod" VALUE="IMEXOrder3"              />
             <I PROPERTY="Driver"                VALUE="Arpack"                  />
             <I PROPERTY="ArpackProblemType"     VALUE="LargestMag"              />
         </SOLVERINFO>
 
+        <TIMEINTEGRATIONSCHEME> 
+            <METHOD> IMEX </METHOD> 
+            <ORDER> 3 </ORDER> 
+        </TIMEINTEGRATIONSCHEME>
+
         <PARAMETERS>
             <P> TimeStep      = 0.001               </P>
             <P> FinalTime     = 1                   </P>
diff --git a/events/2015/Crete-SummerSchool/TutorialFiles/Cylinder/Stability/Direct/Cylinder_Direct.xml b/events/2015/Crete-SummerSchool/TutorialFiles/Cylinder/Stability/Direct/Cylinder_Direct.xml
index 57476f82743f32f8b1e027e24a0cd46982b54f6b..86f3d368175b0e0fdb62fdd2d7efd92045cce386 100644
--- a/events/2015/Crete-SummerSchool/TutorialFiles/Cylinder/Stability/Direct/Cylinder_Direct.xml
+++ b/events/2015/Crete-SummerSchool/TutorialFiles/Cylinder/Stability/Direct/Cylinder_Direct.xml
@@ -6,11 +6,15 @@
             <I PROPERTY="EQTYPE"                  VALUE="UnsteadyNavierStokes"    />
             <I PROPERTY="EvolutionOperator"       VALUE="Direct"                  />
             <I PROPERTY="Projection"              VALUE="Galerkin"                />
-            <I PROPERTY="TimeIntegrationMethod"   VALUE="IMEXOrder2"              />
             <I PROPERTY="Driver"                  VALUE="..."                  />
             <I PROPERTY="ArpackProblemType"       VALUE="LargestMag"              />
         </SOLVERINFO>
 
+        <TIMEINTEGRATIONSCHEME> 
+            <METHOD> IMEX </METHOD> 
+            <ORDER> 2 </ORDER> 
+        </TIMEINTEGRATIONSCHEME>
+
         <PARAMETERS>
             <P> TimeStep      = 0.0008    </P>
             <P> NumSteps      = 1250      </P>
diff --git a/events/2015/Crete-SummerSchool/TutorialFiles/Cylinder/Stability/Receptivity/Cylinder_Direct.xml b/events/2015/Crete-SummerSchool/TutorialFiles/Cylinder/Stability/Receptivity/Cylinder_Direct.xml
index 98b2a9e3a443b32ea9b581d9b8eda1544ec6c031..9588075ee3527d8605bdc98ab7912d01db1af39d 100644
--- a/events/2015/Crete-SummerSchool/TutorialFiles/Cylinder/Stability/Receptivity/Cylinder_Direct.xml
+++ b/events/2015/Crete-SummerSchool/TutorialFiles/Cylinder/Stability/Receptivity/Cylinder_Direct.xml
@@ -10,11 +10,15 @@
             <I PROPERTY="EQTYPE" VALUE="UnsteadyNavierStokes"/>
             <I PROPERTY="EvolutionOperator" VALUE="Direct"/>
             <I PROPERTY="Projection" VALUE="Galerkin"/>
-            <I PROPERTY="TimeIntegrationMethod" VALUE="IMEXOrder2"/>
             <I PROPERTY="Driver" VALUE="Arpack" />
             <I PROPERTY="ArpackProblemType" VALUE="LargestMag" />
         </SOLVERINFO>
 
+        <TIMEINTEGRATIONSCHEME> 
+            <METHOD> IMEX </METHOD> 
+            <ORDER> 2 </ORDER> 
+        </TIMEINTEGRATIONSCHEME>
+
         <PARAMETERS>
             <P> TimeStep      = 0.0008 </P>
             <P> NumSteps      = 1250 </P>
diff --git a/events/2015/Crete-SummerSchool/TutorialFilesComplete/BackwardStep/Base/bfs-Base.xml b/events/2015/Crete-SummerSchool/TutorialFilesComplete/BackwardStep/Base/bfs-Base.xml
index 910fc976ba0c2142f47ec78b728dbac3cc3c73b9..763251c75a0a9f6ce4ea796d10a1ee7ba9d40f0b 100644
--- a/events/2015/Crete-SummerSchool/TutorialFilesComplete/BackwardStep/Base/bfs-Base.xml
+++ b/events/2015/Crete-SummerSchool/TutorialFilesComplete/BackwardStep/Base/bfs-Base.xml
@@ -5,11 +5,15 @@
             <I PROPERTY="EQTYPE"                VALUE="UnsteadyNavierStokes"      />
             <I PROPERTY="AdvectionForm"         VALUE="Convective"                />
             <I PROPERTY="Projection"            VALUE="Galerkin"                  />
-            <I PROPERTY="TimeIntegrationMethod" VALUE="IMEXOrder2"                />
             <I PROPERTY="SOLVERTYPE"            VALUE="VelocityCorrectionScheme"  />
             <I PROPERTY="Driver"                VALUE="Standard"                  />
         </SOLVERINFO>
 
+        <TIMEINTEGRATIONSCHEME> 
+            <METHOD> IMEX </METHOD> 
+            <ORDER> 2 </ORDER> 
+        </TIMEINTEGRATIONSCHEME>
+
         <PARAMETERS>
             <P> TimeStep      = 0.002         </P>
             <P> NumSteps      = 400000        </P>
diff --git a/events/2015/Crete-SummerSchool/TutorialFilesComplete/BackwardStep/Energy/bfs_energy_tau01.xml b/events/2015/Crete-SummerSchool/TutorialFilesComplete/BackwardStep/Energy/bfs_energy_tau01.xml
index 93cf2e3c3006ba9fe33d003142e20db92883e6fd..a3ea69bec0a805ce7a03eb149678f3aa53f4bca1 100644
--- a/events/2015/Crete-SummerSchool/TutorialFilesComplete/BackwardStep/Energy/bfs_energy_tau01.xml
+++ b/events/2015/Crete-SummerSchool/TutorialFilesComplete/BackwardStep/Energy/bfs_energy_tau01.xml
@@ -8,12 +8,16 @@
         <SOLVERINFO>
             <I PROPERTY="EQTYPE"                VALUE="UnsteadyNavierStokes"    />
             <I PROPERTY="Projection"            VALUE="Galerkin"                />
-            <I PROPERTY="TimeIntegrationMethod" VALUE="IMEXOrder2"              />
             <I PROPERTY="SOLVERTYPE"            VALUE="VelocityCorrectionScheme"/>
             <I PROPERTY="EvolutionOperator" VALUE="Direct" />
             <I PROPERTY="Driver" VALUE="Standard" />
         </SOLVERINFO>
 
+        <TIMEINTEGRATIONSCHEME> 
+            <METHOD> IMEX </METHOD> 
+            <ORDER> 2 </ORDER> 
+        </TIMEINTEGRATIONSCHEME>
+
         <PARAMETERS>
             <P> TimeStep      = 0.002               </P>
             <P> FinalTime     = 70                  </P>
diff --git a/events/2015/Crete-SummerSchool/TutorialFilesComplete/BackwardStep/Energy/bfs_energy_tau20.xml b/events/2015/Crete-SummerSchool/TutorialFilesComplete/BackwardStep/Energy/bfs_energy_tau20.xml
index 00fe3e153aa9d7f2736040c6fe1190451092a03a..dc8d84ef860529725349d660e9d38b9f4850968b 100644
--- a/events/2015/Crete-SummerSchool/TutorialFilesComplete/BackwardStep/Energy/bfs_energy_tau20.xml
+++ b/events/2015/Crete-SummerSchool/TutorialFilesComplete/BackwardStep/Energy/bfs_energy_tau20.xml
@@ -8,12 +8,16 @@
         <SOLVERINFO>
             <I PROPERTY="EQTYPE"                VALUE="UnsteadyNavierStokes"    />
             <I PROPERTY="Projection"            VALUE="Galerkin"                />
-            <I PROPERTY="TimeIntegrationMethod" VALUE="IMEXOrder2"              />
             <I PROPERTY="SOLVERTYPE"            VALUE="VelocityCorrectionScheme"/>
             <I PROPERTY="EvolutionOperator" VALUE="Direct" />
             <I PROPERTY="Driver" VALUE="Standard" />
         </SOLVERINFO>
 
+        <TIMEINTEGRATIONSCHEME> 
+            <METHOD> IMEX </METHOD> 
+            <ORDER> 2 </ORDER> 
+        </TIMEINTEGRATIONSCHEME>
+
         <PARAMETERS>
             <P> TimeStep      = 0.002               </P>
             <P> FinalTime     = 70                  </P>
diff --git a/events/2015/Crete-SummerSchool/TutorialFilesComplete/BackwardStep/Stability/bfs_tg.xml b/events/2015/Crete-SummerSchool/TutorialFilesComplete/BackwardStep/Stability/bfs_tg.xml
index ddebd7653c92806de11be0fd2bdb5dec923c2d5b..8320e5a19e3e4cbf6139371129ef89c03a260e5f 100644
--- a/events/2015/Crete-SummerSchool/TutorialFilesComplete/BackwardStep/Stability/bfs_tg.xml
+++ b/events/2015/Crete-SummerSchool/TutorialFilesComplete/BackwardStep/Stability/bfs_tg.xml
@@ -8,13 +8,17 @@
         <SOLVERINFO>
             <I PROPERTY="EQTYPE"                VALUE="UnsteadyNavierStokes"    />
             <I PROPERTY="Projection"            VALUE="Galerkin"                />
-            <I PROPERTY="TimeIntegrationMethod" VALUE="IMEXOrder2"              />
             <I PROPERTY="SOLVERTYPE"            VALUE="VelocityCorrectionScheme"/>
             <I PROPERTY="Driver"                VALUE="Arpack"                  />
             <I PROPERTY="ArpackProblemType"     VALUE="LargestMag"              />
             <I PROPERTY="EvolutionOperator"     VALUE="TransientGrowth"         />
         </SOLVERINFO>
 
+        <TIMEINTEGRATIONSCHEME> 
+            <METHOD> IMEX </METHOD> 
+            <ORDER> 2 </ORDER> 
+        </TIMEINTEGRATIONSCHEME>
+
         <PARAMETERS>
             <P> TimeStep      = 0.002               </P>
             <P> FinalTime     = 1                   </P>
diff --git a/events/2015/Crete-SummerSchool/TutorialFilesComplete/Channel/Base/Channel-Base.xml b/events/2015/Crete-SummerSchool/TutorialFilesComplete/Channel/Base/Channel-Base.xml
index 261e30a08807aac4ca7e911458a286979b619523..b86606c1096e701c39f24ad0b364a903eb7bf748 100644
--- a/events/2015/Crete-SummerSchool/TutorialFilesComplete/Channel/Base/Channel-Base.xml
+++ b/events/2015/Crete-SummerSchool/TutorialFilesComplete/Channel/Base/Channel-Base.xml
@@ -3,13 +3,17 @@
     <CONDITIONS>
         <SOLVERINFO>
             <I PROPERTY="SolverType"              VALUE="VelocityCorrectionScheme"/>
-            <I PROPERTY="TimeIntegrationMethod"   VALUE="IMEXOrder3"              />
             <I PROPERTY="EQTYPE"                  VALUE="UnsteadyNavierStokes"    />
             <I PROPERTY="EvolutionOperator"       VALUE="Nonlinear"               />
             <I PROPERTY="Projection"              VALUE="Continuous"              />
             <I PROPERTY="Driver"                  VALUE="Standard"                />
         </SOLVERINFO>
 
+        <TIMEINTEGRATIONSCHEME> 
+            <METHOD> IMEX </METHOD> 
+            <ORDER> 3 </ORDER> 
+        </TIMEINTEGRATIONSCHEME>
+
         <PARAMETERS>
             <P> TimeStep      = 0.001     </P>
             <P> NumSteps      = 1000      </P>
diff --git a/events/2015/Crete-SummerSchool/TutorialFilesComplete/Channel/Stability/VCS/Channel-VCS.xml b/events/2015/Crete-SummerSchool/TutorialFilesComplete/Channel/Stability/VCS/Channel-VCS.xml
index 95d55a8f0a18a8ff22f9c42ca590040f5d107c03..c00f17cad41a16718b335f0674fd59eb067bca9a 100644
--- a/events/2015/Crete-SummerSchool/TutorialFilesComplete/Channel/Stability/VCS/Channel-VCS.xml
+++ b/events/2015/Crete-SummerSchool/TutorialFilesComplete/Channel/Stability/VCS/Channel-VCS.xml
@@ -5,12 +5,16 @@
             <I PROPERTY="SolverType"            VALUE="VelocityCorrectionScheme"/>
             <I PROPERTY="EQTYPE"                VALUE="UnsteadyNavierStokes"    />
             <I PROPERTY="Projection"            VALUE="Continuous"              />
-            <I PROPERTY="TimeIntegrationMethod" VALUE="IMEXOrder3"              />
             <I PROPERTY="EvolutionOperator"     VALUE="Direct"                  />
             <I PROPERTY="Driver"                VALUE="Arpack"                  />
             <I PROPERTY="ArpackProblemType"     VALUE="LargestMag"              />
         </SOLVERINFO>
 
+        <TIMEINTEGRATIONSCHEME> 
+            <METHOD> IMEX </METHOD> 
+            <ORDER> 3 </ORDER> 
+        </TIMEINTEGRATIONSCHEME>
+
         <PARAMETERS>
             <P> TimeStep      = 0.001     </P>
             <P> NumSteps      = 500       </P>
diff --git a/events/2015/Crete-SummerSchool/TutorialFilesComplete/Cylinder/Base/Cylinder-Base.xml b/events/2015/Crete-SummerSchool/TutorialFilesComplete/Cylinder/Base/Cylinder-Base.xml
index 553deeebb90b2992ff7c35ae4806df8bcf392693..3e142cb1d5ffe39d4f2b4d7219b41a517dc399f7 100644
--- a/events/2015/Crete-SummerSchool/TutorialFilesComplete/Cylinder/Base/Cylinder-Base.xml
+++ b/events/2015/Crete-SummerSchool/TutorialFilesComplete/Cylinder/Base/Cylinder-Base.xml
@@ -11,10 +11,14 @@
             <I PROPERTY="EQTYPE"                  VALUE="UnsteadyNavierStokes"    />
             <I PROPERTY="Projection"              VALUE="Continuous"              />
             <I PROPERTY="EvolutionOperator"       VALUE="Nonlinear"               />
-            <I PROPERTY="TimeIntegrationMethod"   VALUE="IMEXOrder2"              />
             <I PROPERTY="Driver"                  VALUE="Standard"                />
         </SOLVERINFO>
 
+        <TIMEINTEGRATIONSCHEME> 
+            <METHOD> IMEX </METHOD> 
+            <ORDER> 2 </ORDER> 
+        </TIMEINTEGRATIONSCHEME>
+
         <PARAMETERS>
             <P> TimeStep      = 0.0008    </P>
             <P> NumSteps      = 625000    </P>
diff --git a/events/2015/Crete-SummerSchool/TutorialFilesComplete/Cylinder/Stability/Adjoint/Cylinder_Adjoint.xml b/events/2015/Crete-SummerSchool/TutorialFilesComplete/Cylinder/Stability/Adjoint/Cylinder_Adjoint.xml
index 90e847d745cba80aa97ac35dd9e6f11279dc8d83..a93130f971847d23700630daea3b36476bb84928 100644
--- a/events/2015/Crete-SummerSchool/TutorialFilesComplete/Cylinder/Stability/Adjoint/Cylinder_Adjoint.xml
+++ b/events/2015/Crete-SummerSchool/TutorialFilesComplete/Cylinder/Stability/Adjoint/Cylinder_Adjoint.xml
@@ -6,11 +6,15 @@
             <I PROPERTY="EQTYPE"                VALUE="UnsteadyNavierStokes"    />
             <I PROPERTY="EvolutionOperator"     VALUE="Adjoint"                 />
             <I PROPERTY="Projection"            VALUE="Galerkin"                />
-            <I PROPERTY="TimeIntegrationMethod" VALUE="IMEXOrder3"              />
             <I PROPERTY="Driver"                VALUE="Arpack"                  />
             <I PROPERTY="ArpackProblemType"     VALUE="LargestMag"              />
         </SOLVERINFO>
 
+        <TIMEINTEGRATIONSCHEME> 
+            <METHOD> IMEX </METHOD> 
+            <ORDER> 3 </ORDER> 
+        </TIMEINTEGRATIONSCHEME>
+
         <PARAMETERS>
             <P> TimeStep      = 0.001               </P>
             <P> FinalTime     = 1                   </P>
diff --git a/events/2015/Crete-SummerSchool/TutorialFilesComplete/Cylinder/Stability/Direct/Cylinder_Direct.xml b/events/2015/Crete-SummerSchool/TutorialFilesComplete/Cylinder/Stability/Direct/Cylinder_Direct.xml
index d296af685e6547cba7d360f4461ba18c6100ca11..d6148d0298436f253654e5c88a585e1fbb136846 100644
--- a/events/2015/Crete-SummerSchool/TutorialFilesComplete/Cylinder/Stability/Direct/Cylinder_Direct.xml
+++ b/events/2015/Crete-SummerSchool/TutorialFilesComplete/Cylinder/Stability/Direct/Cylinder_Direct.xml
@@ -6,11 +6,15 @@
             <I PROPERTY="EQTYPE"                  VALUE="UnsteadyNavierStokes"    />
             <I PROPERTY="EvolutionOperator"       VALUE="Direct"                  />
             <I PROPERTY="Projection"              VALUE="Galerkin"                />
-            <I PROPERTY="TimeIntegrationMethod"   VALUE="IMEXOrder2"              />
             <I PROPERTY="Driver"                  VALUE="Arpack"                  />
             <I PROPERTY="ArpackProblemType"       VALUE="LargestMag"              />
         </SOLVERINFO>
 
+        <TIMEINTEGRATIONSCHEME> 
+            <METHOD> IMEX </METHOD> 
+            <ORDER> 2 </ORDER> 
+        </TIMEINTEGRATIONSCHEME>
+
         <PARAMETERS>
             <P> TimeStep      = 0.0008    </P>
             <P> NumSteps      = 1250      </P>
diff --git a/events/2015/Crete-SummerSchool/TutorialFilesComplete/Cylinder/Stability/Receptivity/Cylinder_Direct.xml b/events/2015/Crete-SummerSchool/TutorialFilesComplete/Cylinder/Stability/Receptivity/Cylinder_Direct.xml
index ceb7b0cb7338f39cd5fd99a07d6f7a0c4823579b..cb115d73897e9934e28d2336ab343cb314ac7baf 100644
--- a/events/2015/Crete-SummerSchool/TutorialFilesComplete/Cylinder/Stability/Receptivity/Cylinder_Direct.xml
+++ b/events/2015/Crete-SummerSchool/TutorialFilesComplete/Cylinder/Stability/Receptivity/Cylinder_Direct.xml
@@ -3447,11 +3447,15 @@
             <I PROPERTY="EQTYPE" VALUE="UnsteadyNavierStokes"/>
             <I PROPERTY="EvolutionOperator" VALUE="Direct"/>
             <I PROPERTY="Projection" VALUE="Galerkin"/>
-            <I PROPERTY="TimeIntegrationMethod" VALUE="IMEXOrder2"/>
             <I PROPERTY="Driver" VALUE="Arpack" />
             <I PROPERTY="ArpackProblemType" VALUE="LargestMag" />
         </SOLVERINFO>
 
+        <TIMEINTEGRATIONSCHEME> 
+            <METHOD> IMEX </METHOD> 
+            <ORDER> 2 </ORDER> 
+        </TIMEINTEGRATIONSCHEME>
+
         <PARAMETERS>
             <P> TimeStep      = 0.0008 </P>
             <P> NumSteps      = 1250 </P>
diff --git a/events/2015/Imperial-NektarWorkshop/tutorial1-adr/Files/ADR_conditions.xml b/events/2015/Imperial-NektarWorkshop/tutorial1-adr/Files/ADR_conditions.xml
index 0306eafd8bcd26c2d216b5172ffb6ddcc34aa672..aad0aab29dbb39879977cb00eb8aa5650ed730d5 100644
--- a/events/2015/Imperial-NektarWorkshop/tutorial1-adr/Files/ADR_conditions.xml
+++ b/events/2015/Imperial-NektarWorkshop/tutorial1-adr/Files/ADR_conditions.xml
@@ -22,9 +22,13 @@
             <I PROPERTY="Projection"            VALUE="DisContinuous"       />
             <I PROPERTY="AdvectionType"         VALUE="WeakDG"              />
             <I PROPERTY="UpwindType"            VALUE="Upwind"              />
-            <I PROPERTY="TimeIntegrationMethod" VALUE="ClassicalRungeKutta4"/>
         </SOLVERINFO>
 
+        <TIMEINTEGRATIONSCHEME> 
+            <METHOD> RungeKutta </METHOD> 
+            <ORDER> 4 </ORDER> 
+        </TIMEINTEGRATIONSCHEME>
+
         <VARIABLES>
             <V ID="0"> u </V>
         </VARIABLES>
diff --git a/events/2015/Imperial-NektarWorkshop/tutorial1-adr/Files/ADR_mesh_aligned_xml/P0000000.xml b/events/2015/Imperial-NektarWorkshop/tutorial1-adr/Files/ADR_mesh_aligned_xml/P0000000.xml
index dd84d7bb6f968ec0e937808babaad4dab6a7edc1..fcbc9fb92b5012e4ba34be373988e962c155c1b3 100644
--- a/events/2015/Imperial-NektarWorkshop/tutorial1-adr/Files/ADR_mesh_aligned_xml/P0000000.xml
+++ b/events/2015/Imperial-NektarWorkshop/tutorial1-adr/Files/ADR_mesh_aligned_xml/P0000000.xml
@@ -194,8 +194,11 @@
             <I PROPERTY="Projection" VALUE="DisContinuous" />
             <I PROPERTY="AdvectionType" VALUE="WeakDG" />
             <I PROPERTY="UpwindType" VALUE="Upwind" />
-            <I PROPERTY="TimeIntegrationMethod" VALUE="ClassicalRungeKutta4" />
         </SOLVERINFO>
+        <TIMEINTEGRATIONSCHEME> 
+            <METHOD> RungeKutta </METHOD> 
+            <ORDER> 4 </ORDER> 
+        </TIMEINTEGRATIONSCHEME>
         <VARIABLES>
             <V ID="0">u</V>
         </VARIABLES>
diff --git a/events/2015/Imperial-NektarWorkshop/tutorial1-adr/Files/ADR_mesh_aligned_xml/P0000001.xml b/events/2015/Imperial-NektarWorkshop/tutorial1-adr/Files/ADR_mesh_aligned_xml/P0000001.xml
index 17b1d18fc04be32164b212a9ed4a7ba0669a7081..3390f9b113e1270f32545be88c3c5efe11bcd29a 100644
--- a/events/2015/Imperial-NektarWorkshop/tutorial1-adr/Files/ADR_mesh_aligned_xml/P0000001.xml
+++ b/events/2015/Imperial-NektarWorkshop/tutorial1-adr/Files/ADR_mesh_aligned_xml/P0000001.xml
@@ -194,8 +194,11 @@
             <I PROPERTY="Projection" VALUE="DisContinuous" />
             <I PROPERTY="AdvectionType" VALUE="WeakDG" />
             <I PROPERTY="UpwindType" VALUE="Upwind" />
-            <I PROPERTY="TimeIntegrationMethod" VALUE="ClassicalRungeKutta4" />
         </SOLVERINFO>
+        <TIMEINTEGRATIONSCHEME> 
+            <METHOD> RungeKutta </METHOD> 
+            <ORDER> 4 </ORDER> 
+        </TIMEINTEGRATIONSCHEME>
         <VARIABLES>
             <V ID="0">u</V>
         </VARIABLES>
diff --git a/events/2015/Imperial-NektarWorkshop/tutorial1-adr/Files/ADR_mesh_xml/P0000000.xml b/events/2015/Imperial-NektarWorkshop/tutorial1-adr/Files/ADR_mesh_xml/P0000000.xml
index bdff10ad30f5858ad5ed213914dcd0a23bab078d..2d173e2615ba11349bdd0a9e4954f4b8858625f7 100644
--- a/events/2015/Imperial-NektarWorkshop/tutorial1-adr/Files/ADR_mesh_xml/P0000000.xml
+++ b/events/2015/Imperial-NektarWorkshop/tutorial1-adr/Files/ADR_mesh_xml/P0000000.xml
@@ -194,8 +194,11 @@
             <I PROPERTY="Projection" VALUE="DisContinuous" />
             <I PROPERTY="AdvectionType" VALUE="WeakDG" />
             <I PROPERTY="UpwindType" VALUE="Upwind" />
-            <I PROPERTY="TimeIntegrationMethod" VALUE="ClassicalRungeKutta4" />
         </SOLVERINFO>
+        <TIMEINTEGRATIONSCHEME> 
+            <METHOD> RungeKutta </METHOD> 
+            <ORDER> 4 </ORDER> 
+        </TIMEINTEGRATIONSCHEME>
         <VARIABLES>
             <V ID="0">u</V>
         </VARIABLES>
diff --git a/events/2015/Imperial-NektarWorkshop/tutorial1-adr/Files/ADR_mesh_xml/P0000001.xml b/events/2015/Imperial-NektarWorkshop/tutorial1-adr/Files/ADR_mesh_xml/P0000001.xml
index e3c80b3f6ffa136e1b07c57f06d961f9bf9b94de..e826cbe07c62fa29e760b137973271b3d633fa8b 100644
--- a/events/2015/Imperial-NektarWorkshop/tutorial1-adr/Files/ADR_mesh_xml/P0000001.xml
+++ b/events/2015/Imperial-NektarWorkshop/tutorial1-adr/Files/ADR_mesh_xml/P0000001.xml
@@ -194,8 +194,11 @@
             <I PROPERTY="Projection" VALUE="DisContinuous" />
             <I PROPERTY="AdvectionType" VALUE="WeakDG" />
             <I PROPERTY="UpwindType" VALUE="Upwind" />
-            <I PROPERTY="TimeIntegrationMethod" VALUE="ClassicalRungeKutta4" />
         </SOLVERINFO>
+        <TIMEINTEGRATIONSCHEME> 
+            <METHOD> RungeKutta </METHOD> 
+            <ORDER> 4 </ORDER> 
+        </TIMEINTEGRATIONSCHEME>
         <VARIABLES>
             <V ID="0">u</V>
         </VARIABLES>
diff --git a/events/2015/Imperial-NektarWorkshop/tutorial1-adr/tutorial1-adr.tex b/events/2015/Imperial-NektarWorkshop/tutorial1-adr/tutorial1-adr.tex
index 969f7428e608054c5a61f569042d5da77daad564..93338803d2ffc1c072ec09f46c093243774d7b2b 100644
--- a/events/2015/Imperial-NektarWorkshop/tutorial1-adr/tutorial1-adr.tex
+++ b/events/2015/Imperial-NektarWorkshop/tutorial1-adr/tutorial1-adr.tex
@@ -311,7 +311,8 @@ exact solution, against which the L$_{2}$ and L$_{\infty}$ errors are computed.
 
 After having configured the \inltt{VARIABLES} tag, the initial and boundary conditions, 
 the advection velocity and the exact solution we can complete the tag \inltt{CONDITIONS} 
-prescribing the parameters necessary (\inltt{PARAMETERS})and the solver settings (\inltt{SOLVERINFO}):
+prescribing the parameters necessary (\inltt{PARAMETERS}), solver settings (\inltt{SOLVERINFO}), 
+and time integration scheme (\inltt{TIMEINTEGRATIONSCHEME}):
 %
 \begin{lstlisting}[style=XMLStyle]
 <CONDITIONS>
@@ -331,8 +332,12 @@ prescribing the parameters necessary (\inltt{PARAMETERS})and the solver settings
         <I PROPERTY="Projection"            		VALUE="DisContinuous"       		/>
         <I PROPERTY="AdvectionType"      		VALUE="WeakDG"              		/>
         <I PROPERTY="UpwindType"           	VALUE="Upwind"              		/>
-        <I PROPERTY="TimeIntegrationMethod" 	VALUE="ClassicalRungeKutta4"	/>
     </SOLVERINFO>
+
+    <TIMEINTEGRATIONSCHEME> 
+        <METHOD> RungeKutta </METHOD> 
+        <ORDER> 4 </ORDER> 
+    </TIMEINTEGRATIONSCHEME>
     ...
     ...
     ...
@@ -350,9 +355,8 @@ In the \inltt{SOLVERINFO} tag, \inltt{EQTYPE} is the type of equation to be solv
 is the spatial projection operator to be used (which in this case is specified to be `DisContinuous'), 
 \inltt{AdvectionType} is the advection operator to be adopted (where the \inltt{VALUE} `WeakDG' 
 implies the use of a weak Discontinuous Galerkin technique), \inltt{UpwindType} is the numerical 
-flux to be used at the element interfaces when a discontinuous projection is used, \inltt{TimeIntegrationMethod} 
-allows selecting the time-integration scheme. For additional solver-setting options refer to the 
-\href{http://www.nektar.info/src/user-guide-\nekver.pdf}{User-Guide}.
+flux to be used at the element interfaces when a discontinuous projection is used. For additional 
+solver-setting options refer to the \href{http://www.nektar.info/src/user-guide-\nekver.pdf}{User-Guide}.
 
 Finally, we need to specify the expansion bases we want to use in each of the three 
 composites or sub-domains (\inltt{COMPOSITE=".."}) introduced in section \ref{adr-pre}:
@@ -410,7 +414,7 @@ As soon as the file finishes running, we should see the following screen output:
 	           Time Step: 0.001
 	        No. of Steps: 1000
 	 Checkpoints (steps): 100
-	    Integration Type: ClassicalRungeKutta4
+	    Integration Type: RungeKutta4
 ==========================================
 Initial Conditions:
   - Field u: sin(k*x)*cos(k*y)
diff --git a/flow-stability/bfs/flow-stability-bfs/completed/base/bfs-Base.xml b/flow-stability/bfs/flow-stability-bfs/completed/base/bfs-Base.xml
index 6ae02aaa14b927a80749d133daa744da3eecf86d..3224b8d351cb5e6e7f30d9a5601a50108769c7a4 100644
--- a/flow-stability/bfs/flow-stability-bfs/completed/base/bfs-Base.xml
+++ b/flow-stability/bfs/flow-stability-bfs/completed/base/bfs-Base.xml
@@ -5,11 +5,15 @@
             <I PROPERTY="EQTYPE"                VALUE="UnsteadyNavierStokes"      />
             <I PROPERTY="AdvectionForm"         VALUE="Convective"                />
             <I PROPERTY="Projection"            VALUE="Galerkin"                  />
-            <I PROPERTY="TimeIntegrationMethod" VALUE="IMEXOrder2"                />
             <I PROPERTY="SOLVERTYPE"            VALUE="VelocityCorrectionScheme"  />
             <I PROPERTY="Driver"                VALUE="Standard"                  />
         </SOLVERINFO>
 
+        <TIMEINTEGRATIONSCHEME> 
+            <METHOD> IMEX </METHOD> 
+            <ORDER> 2 </ORDER> 
+        </TIMEINTEGRATIONSCHEME>
+
         <PARAMETERS>
             <P> TimeStep      = 0.002         </P>
             <P> NumSteps      = 400000        </P>
diff --git a/flow-stability/bfs/flow-stability-bfs/completed/energy/bfs_energy_tau01.xml b/flow-stability/bfs/flow-stability-bfs/completed/energy/bfs_energy_tau01.xml
index 93cf2e3c3006ba9fe33d003142e20db92883e6fd..a3ea69bec0a805ce7a03eb149678f3aa53f4bca1 100644
--- a/flow-stability/bfs/flow-stability-bfs/completed/energy/bfs_energy_tau01.xml
+++ b/flow-stability/bfs/flow-stability-bfs/completed/energy/bfs_energy_tau01.xml
@@ -8,12 +8,16 @@
         <SOLVERINFO>
             <I PROPERTY="EQTYPE"                VALUE="UnsteadyNavierStokes"    />
             <I PROPERTY="Projection"            VALUE="Galerkin"                />
-            <I PROPERTY="TimeIntegrationMethod" VALUE="IMEXOrder2"              />
             <I PROPERTY="SOLVERTYPE"            VALUE="VelocityCorrectionScheme"/>
             <I PROPERTY="EvolutionOperator" VALUE="Direct" />
             <I PROPERTY="Driver" VALUE="Standard" />
         </SOLVERINFO>
 
+        <TIMEINTEGRATIONSCHEME> 
+            <METHOD> IMEX </METHOD> 
+            <ORDER> 2 </ORDER> 
+        </TIMEINTEGRATIONSCHEME>
+
         <PARAMETERS>
             <P> TimeStep      = 0.002               </P>
             <P> FinalTime     = 70                  </P>
diff --git a/flow-stability/bfs/flow-stability-bfs/completed/energy/bfs_energy_tau20.xml b/flow-stability/bfs/flow-stability-bfs/completed/energy/bfs_energy_tau20.xml
index 00fe3e153aa9d7f2736040c6fe1190451092a03a..dc8d84ef860529725349d660e9d38b9f4850968b 100644
--- a/flow-stability/bfs/flow-stability-bfs/completed/energy/bfs_energy_tau20.xml
+++ b/flow-stability/bfs/flow-stability-bfs/completed/energy/bfs_energy_tau20.xml
@@ -8,12 +8,16 @@
         <SOLVERINFO>
             <I PROPERTY="EQTYPE"                VALUE="UnsteadyNavierStokes"    />
             <I PROPERTY="Projection"            VALUE="Galerkin"                />
-            <I PROPERTY="TimeIntegrationMethod" VALUE="IMEXOrder2"              />
             <I PROPERTY="SOLVERTYPE"            VALUE="VelocityCorrectionScheme"/>
             <I PROPERTY="EvolutionOperator" VALUE="Direct" />
             <I PROPERTY="Driver" VALUE="Standard" />
         </SOLVERINFO>
 
+        <TIMEINTEGRATIONSCHEME> 
+            <METHOD> IMEX </METHOD> 
+            <ORDER> 2 </ORDER> 
+        </TIMEINTEGRATIONSCHEME>
+
         <PARAMETERS>
             <P> TimeStep      = 0.002               </P>
             <P> FinalTime     = 70                  </P>
diff --git a/flow-stability/bfs/flow-stability-bfs/completed/stability/bfs_tg.xml b/flow-stability/bfs/flow-stability-bfs/completed/stability/bfs_tg.xml
index ddebd7653c92806de11be0fd2bdb5dec923c2d5b..8320e5a19e3e4cbf6139371129ef89c03a260e5f 100644
--- a/flow-stability/bfs/flow-stability-bfs/completed/stability/bfs_tg.xml
+++ b/flow-stability/bfs/flow-stability-bfs/completed/stability/bfs_tg.xml
@@ -8,13 +8,17 @@
         <SOLVERINFO>
             <I PROPERTY="EQTYPE"                VALUE="UnsteadyNavierStokes"    />
             <I PROPERTY="Projection"            VALUE="Galerkin"                />
-            <I PROPERTY="TimeIntegrationMethod" VALUE="IMEXOrder2"              />
             <I PROPERTY="SOLVERTYPE"            VALUE="VelocityCorrectionScheme"/>
             <I PROPERTY="Driver"                VALUE="Arpack"                  />
             <I PROPERTY="ArpackProblemType"     VALUE="LargestMag"              />
             <I PROPERTY="EvolutionOperator"     VALUE="TransientGrowth"         />
         </SOLVERINFO>
 
+        <TIMEINTEGRATIONSCHEME> 
+            <METHOD> IMEX </METHOD> 
+            <ORDER> 2 </ORDER> 
+        </TIMEINTEGRATIONSCHEME>
+
         <PARAMETERS>
             <P> TimeStep      = 0.002               </P>
             <P> FinalTime     = 1                   </P>
diff --git a/flow-stability/bfs/flow-stability-bfs/tutorial/base/bfs-Base.xml b/flow-stability/bfs/flow-stability-bfs/tutorial/base/bfs-Base.xml
index 6ae02aaa14b927a80749d133daa744da3eecf86d..3224b8d351cb5e6e7f30d9a5601a50108769c7a4 100644
--- a/flow-stability/bfs/flow-stability-bfs/tutorial/base/bfs-Base.xml
+++ b/flow-stability/bfs/flow-stability-bfs/tutorial/base/bfs-Base.xml
@@ -5,11 +5,15 @@
             <I PROPERTY="EQTYPE"                VALUE="UnsteadyNavierStokes"      />
             <I PROPERTY="AdvectionForm"         VALUE="Convective"                />
             <I PROPERTY="Projection"            VALUE="Galerkin"                  />
-            <I PROPERTY="TimeIntegrationMethod" VALUE="IMEXOrder2"                />
             <I PROPERTY="SOLVERTYPE"            VALUE="VelocityCorrectionScheme"  />
             <I PROPERTY="Driver"                VALUE="Standard"                  />
         </SOLVERINFO>
 
+        <TIMEINTEGRATIONSCHEME> 
+            <METHOD> IMEX </METHOD> 
+            <ORDER> 2 </ORDER> 
+        </TIMEINTEGRATIONSCHEME>
+
         <PARAMETERS>
             <P> TimeStep      = 0.002         </P>
             <P> NumSteps      = 400000        </P>
diff --git a/flow-stability/bfs/flow-stability-bfs/tutorial/energy/bfs_energy_tau01.xml b/flow-stability/bfs/flow-stability-bfs/tutorial/energy/bfs_energy_tau01.xml
index a46082b2966135ab89f120a4aab0f7eb9fe7c2f8..0d751f3618b509a6670cb560b49bd9df33c2ba0c 100644
--- a/flow-stability/bfs/flow-stability-bfs/tutorial/energy/bfs_energy_tau01.xml
+++ b/flow-stability/bfs/flow-stability-bfs/tutorial/energy/bfs_energy_tau01.xml
@@ -8,10 +8,14 @@
         <SOLVERINFO>
             <I PROPERTY="EQTYPE"                VALUE="UnsteadyNavierStokes"    />
             <I PROPERTY="Projection"            VALUE="Galerkin"                />
-            <I PROPERTY="TimeIntegrationMethod" VALUE="IMEXOrder2"              />
             <I PROPERTY="SOLVERTYPE"            VALUE="VelocityCorrectionScheme"/>
         </SOLVERINFO>
 
+        <TIMEINTEGRATIONSCHEME> 
+            <METHOD> IMEX </METHOD> 
+            <ORDER> 2 </ORDER> 
+        </TIMEINTEGRATIONSCHEME>
+
         <PARAMETERS>
             <P> TimeStep      = 0.002               </P>
             <P> FinalTime     = 70                  </P>
diff --git a/flow-stability/bfs/flow-stability-bfs/tutorial/energy/bfs_energy_tau20.xml b/flow-stability/bfs/flow-stability-bfs/tutorial/energy/bfs_energy_tau20.xml
index a46082b2966135ab89f120a4aab0f7eb9fe7c2f8..0d751f3618b509a6670cb560b49bd9df33c2ba0c 100644
--- a/flow-stability/bfs/flow-stability-bfs/tutorial/energy/bfs_energy_tau20.xml
+++ b/flow-stability/bfs/flow-stability-bfs/tutorial/energy/bfs_energy_tau20.xml
@@ -8,10 +8,14 @@
         <SOLVERINFO>
             <I PROPERTY="EQTYPE"                VALUE="UnsteadyNavierStokes"    />
             <I PROPERTY="Projection"            VALUE="Galerkin"                />
-            <I PROPERTY="TimeIntegrationMethod" VALUE="IMEXOrder2"              />
             <I PROPERTY="SOLVERTYPE"            VALUE="VelocityCorrectionScheme"/>
         </SOLVERINFO>
 
+        <TIMEINTEGRATIONSCHEME> 
+            <METHOD> IMEX </METHOD> 
+            <ORDER> 2 </ORDER> 
+        </TIMEINTEGRATIONSCHEME>
+
         <PARAMETERS>
             <P> TimeStep      = 0.002               </P>
             <P> FinalTime     = 70                  </P>
diff --git a/flow-stability/bfs/flow-stability-bfs/tutorial/stability/bfs_tg.xml b/flow-stability/bfs/flow-stability-bfs/tutorial/stability/bfs_tg.xml
index aa1bcd7a60e483e31545c9f7564bd7416e72e14b..f9d1c1a7d4b7c4d30e50f8a06fad6dad1dc518ce 100644
--- a/flow-stability/bfs/flow-stability-bfs/tutorial/stability/bfs_tg.xml
+++ b/flow-stability/bfs/flow-stability-bfs/tutorial/stability/bfs_tg.xml
@@ -8,13 +8,16 @@
         <SOLVERINFO>
             <I PROPERTY="EQTYPE"                VALUE="UnsteadyNavierStokes"    />
             <I PROPERTY="Projection"            VALUE="Galerkin"                />
-            <I PROPERTY="TimeIntegrationMethod" VALUE="IMEXOrder2"              />
             <I PROPERTY="SOLVERTYPE"            VALUE="VelocityCorrectionScheme"/>
             <I PROPERTY="Driver"                VALUE="Arpack"                  />
             <I PROPERTY="ArpackProblemType"     VALUE="LargestMag"              />
-            ...
         </SOLVERINFO>
 
+        <TIMEINTEGRATIONSCHEME> 
+            <METHOD> IMEX </METHOD> 
+            <ORDER> 2 </ORDER> 
+        </TIMEINTEGRATIONSCHEME>
+
         <PARAMETERS>
             <P> TimeStep      = 0.002               </P>
             ...
diff --git a/flow-stability/channel/flow-stability-channel/completed/base/Channel-Base.xml b/flow-stability/channel/flow-stability-channel/completed/base/Channel-Base.xml
index 261e30a08807aac4ca7e911458a286979b619523..b86606c1096e701c39f24ad0b364a903eb7bf748 100644
--- a/flow-stability/channel/flow-stability-channel/completed/base/Channel-Base.xml
+++ b/flow-stability/channel/flow-stability-channel/completed/base/Channel-Base.xml
@@ -3,13 +3,17 @@
     <CONDITIONS>
         <SOLVERINFO>
             <I PROPERTY="SolverType"              VALUE="VelocityCorrectionScheme"/>
-            <I PROPERTY="TimeIntegrationMethod"   VALUE="IMEXOrder3"              />
             <I PROPERTY="EQTYPE"                  VALUE="UnsteadyNavierStokes"    />
             <I PROPERTY="EvolutionOperator"       VALUE="Nonlinear"               />
             <I PROPERTY="Projection"              VALUE="Continuous"              />
             <I PROPERTY="Driver"                  VALUE="Standard"                />
         </SOLVERINFO>
 
+        <TIMEINTEGRATIONSCHEME> 
+            <METHOD> IMEX </METHOD> 
+            <ORDER> 3 </ORDER> 
+        </TIMEINTEGRATIONSCHEME>
+
         <PARAMETERS>
             <P> TimeStep      = 0.001     </P>
             <P> NumSteps      = 1000      </P>
diff --git a/flow-stability/channel/flow-stability-channel/completed/stability/VCS/Channel-VCS.xml b/flow-stability/channel/flow-stability-channel/completed/stability/VCS/Channel-VCS.xml
index 95d55a8f0a18a8ff22f9c42ca590040f5d107c03..c00f17cad41a16718b335f0674fd59eb067bca9a 100644
--- a/flow-stability/channel/flow-stability-channel/completed/stability/VCS/Channel-VCS.xml
+++ b/flow-stability/channel/flow-stability-channel/completed/stability/VCS/Channel-VCS.xml
@@ -5,12 +5,16 @@
             <I PROPERTY="SolverType"            VALUE="VelocityCorrectionScheme"/>
             <I PROPERTY="EQTYPE"                VALUE="UnsteadyNavierStokes"    />
             <I PROPERTY="Projection"            VALUE="Continuous"              />
-            <I PROPERTY="TimeIntegrationMethod" VALUE="IMEXOrder3"              />
             <I PROPERTY="EvolutionOperator"     VALUE="Direct"                  />
             <I PROPERTY="Driver"                VALUE="Arpack"                  />
             <I PROPERTY="ArpackProblemType"     VALUE="LargestMag"              />
         </SOLVERINFO>
 
+        <TIMEINTEGRATIONSCHEME> 
+            <METHOD> IMEX </METHOD> 
+            <ORDER> 3 </ORDER> 
+        </TIMEINTEGRATIONSCHEME>
+
         <PARAMETERS>
             <P> TimeStep      = 0.001     </P>
             <P> NumSteps      = 500       </P>
diff --git a/flow-stability/channel/flow-stability-channel/tutorial/base/Channel-Base.xml b/flow-stability/channel/flow-stability-channel/tutorial/base/Channel-Base.xml
index e9102844a16e93075fdc88791bd9db800cdc861d..5e1e16bf8d93f8ce2af0bc2b3475ad5f45acd188 100644
--- a/flow-stability/channel/flow-stability-channel/tutorial/base/Channel-Base.xml
+++ b/flow-stability/channel/flow-stability-channel/tutorial/base/Channel-Base.xml
@@ -3,16 +3,18 @@
     <CONDITIONS>
         <SOLVERINFO>
             <I PROPERTY="SolverType"              VALUE="VelocityCorrectionScheme"/>
-            <I PROPERTY="TimeIntegrationMethod"   VALUE="IMEXOrder3"              />
-            ...
         </SOLVERINFO>
 
+        <TIMEINTEGRATIONSCHEME> 
+            <METHOD> IMEX </METHOD> 
+            <ORDER> 3 </ORDER> 
+        </TIMEINTEGRATIONSCHEME>
+
         <PARAMETERS>
             <P> TimeStep      = 0.001     </P>
             <P> NumSteps      = 1000      </P>
             <P> IO_CheckSteps = 500       </P>
             <P> IO_InfoSteps  = 100       </P>
-            ...
         </PARAMETERS>
 
         <VARIABLES>
diff --git a/flow-stability/channel/flow-stability-channel/tutorial/stability/VCS/Channel-VCS.xml b/flow-stability/channel/flow-stability-channel/tutorial/stability/VCS/Channel-VCS.xml
index 575eb7483a1f9f789a76e1ac20d28b30fc3f8d93..d5622c28aa00a03219befb591cd04b886c77ff1e 100644
--- a/flow-stability/channel/flow-stability-channel/tutorial/stability/VCS/Channel-VCS.xml
+++ b/flow-stability/channel/flow-stability-channel/tutorial/stability/VCS/Channel-VCS.xml
@@ -5,10 +5,13 @@
             <I PROPERTY="SolverType"            VALUE="VelocityCorrectionScheme"/>
             <I PROPERTY="EQTYPE"                VALUE="UnsteadyNavierStokes"    />
             <I PROPERTY="Projection"            VALUE="Continuous"              />
-            <I PROPERTY="TimeIntegrationMethod" VALUE="IMEXOrder3"              />
-            ...
         </SOLVERINFO>
 
+        <TIMEINTEGRATIONSCHEME> 
+            <METHOD> IMEX </METHOD> 
+            <ORDER> 3 </ORDER> 
+        </TIMEINTEGRATIONSCHEME>
+
         <PARAMETERS>
             <P> TimeStep      = 0.001     </P>
             <P> NumSteps      = 500       </P>
@@ -16,7 +19,6 @@
             <P> IO_InfoSteps  = 20        </P>
             <P> Re            = 7500      </P>
             <P> Kinvis        = 1.0/Re    </P>
-            ...
         </PARAMETERS>
 
         <VARIABLES>
diff --git a/flow-stability/cylinder/flow-stability-cylinder/completed/base/Cylinder-Base.xml b/flow-stability/cylinder/flow-stability-cylinder/completed/base/Cylinder-Base.xml
index 86099d22e2e9a5cb700a1be662957b2b9af22a1e..8ac37c3092e15591aaa770d126786b684f63bb32 100644
--- a/flow-stability/cylinder/flow-stability-cylinder/completed/base/Cylinder-Base.xml
+++ b/flow-stability/cylinder/flow-stability-cylinder/completed/base/Cylinder-Base.xml
@@ -11,10 +11,14 @@
             <I PROPERTY="EQTYPE"                  VALUE="UnsteadyNavierStokes"    />
             <I PROPERTY="Projection"              VALUE="Continuous"              />
             <I PROPERTY="EvolutionOperator"       VALUE="Nonlinear"               />
-            <I PROPERTY="TimeIntegrationMethod"   VALUE="IMEXOrder2"              />
             <I PROPERTY="Driver"                  VALUE="Standard"                />
         </SOLVERINFO>
 
+        <TIMEINTEGRATIONSCHEME> 
+            <METHOD> IMEX </METHOD> 
+            <ORDER> 2 </ORDER> 
+        </TIMEINTEGRATIONSCHEME>
+
         <PARAMETERS>
             <P> TimeStep      = 0.0008    </P>
             <P> NumSteps      = 100    </P>
diff --git a/flow-stability/cylinder/flow-stability-cylinder/completed/stability/Adjoint/Cylinder_Adjoint.xml b/flow-stability/cylinder/flow-stability-cylinder/completed/stability/Adjoint/Cylinder_Adjoint.xml
index 90e847d745cba80aa97ac35dd9e6f11279dc8d83..a93130f971847d23700630daea3b36476bb84928 100644
--- a/flow-stability/cylinder/flow-stability-cylinder/completed/stability/Adjoint/Cylinder_Adjoint.xml
+++ b/flow-stability/cylinder/flow-stability-cylinder/completed/stability/Adjoint/Cylinder_Adjoint.xml
@@ -6,11 +6,15 @@
             <I PROPERTY="EQTYPE"                VALUE="UnsteadyNavierStokes"    />
             <I PROPERTY="EvolutionOperator"     VALUE="Adjoint"                 />
             <I PROPERTY="Projection"            VALUE="Galerkin"                />
-            <I PROPERTY="TimeIntegrationMethod" VALUE="IMEXOrder3"              />
             <I PROPERTY="Driver"                VALUE="Arpack"                  />
             <I PROPERTY="ArpackProblemType"     VALUE="LargestMag"              />
         </SOLVERINFO>
 
+        <TIMEINTEGRATIONSCHEME> 
+            <METHOD> IMEX </METHOD> 
+            <ORDER> 3 </ORDER> 
+        </TIMEINTEGRATIONSCHEME>
+
         <PARAMETERS>
             <P> TimeStep      = 0.001               </P>
             <P> FinalTime     = 1                   </P>
diff --git a/flow-stability/cylinder/flow-stability-cylinder/completed/stability/Direct/Cylinder_Direct.xml b/flow-stability/cylinder/flow-stability-cylinder/completed/stability/Direct/Cylinder_Direct.xml
index d296af685e6547cba7d360f4461ba18c6100ca11..d6148d0298436f253654e5c88a585e1fbb136846 100644
--- a/flow-stability/cylinder/flow-stability-cylinder/completed/stability/Direct/Cylinder_Direct.xml
+++ b/flow-stability/cylinder/flow-stability-cylinder/completed/stability/Direct/Cylinder_Direct.xml
@@ -6,11 +6,15 @@
             <I PROPERTY="EQTYPE"                  VALUE="UnsteadyNavierStokes"    />
             <I PROPERTY="EvolutionOperator"       VALUE="Direct"                  />
             <I PROPERTY="Projection"              VALUE="Galerkin"                />
-            <I PROPERTY="TimeIntegrationMethod"   VALUE="IMEXOrder2"              />
             <I PROPERTY="Driver"                  VALUE="Arpack"                  />
             <I PROPERTY="ArpackProblemType"       VALUE="LargestMag"              />
         </SOLVERINFO>
 
+        <TIMEINTEGRATIONSCHEME> 
+            <METHOD> IMEX </METHOD> 
+            <ORDER> 2 </ORDER> 
+        </TIMEINTEGRATIONSCHEME>
+
         <PARAMETERS>
             <P> TimeStep      = 0.0008    </P>
             <P> NumSteps      = 1250      </P>
diff --git a/flow-stability/cylinder/flow-stability-cylinder/completed/stability/Receptivity/Cylinder_Direct.xml b/flow-stability/cylinder/flow-stability-cylinder/completed/stability/Receptivity/Cylinder_Direct.xml
index ceb7b0cb7338f39cd5fd99a07d6f7a0c4823579b..cb115d73897e9934e28d2336ab343cb314ac7baf 100644
--- a/flow-stability/cylinder/flow-stability-cylinder/completed/stability/Receptivity/Cylinder_Direct.xml
+++ b/flow-stability/cylinder/flow-stability-cylinder/completed/stability/Receptivity/Cylinder_Direct.xml
@@ -3447,11 +3447,15 @@
             <I PROPERTY="EQTYPE" VALUE="UnsteadyNavierStokes"/>
             <I PROPERTY="EvolutionOperator" VALUE="Direct"/>
             <I PROPERTY="Projection" VALUE="Galerkin"/>
-            <I PROPERTY="TimeIntegrationMethod" VALUE="IMEXOrder2"/>
             <I PROPERTY="Driver" VALUE="Arpack" />
             <I PROPERTY="ArpackProblemType" VALUE="LargestMag" />
         </SOLVERINFO>
 
+        <TIMEINTEGRATIONSCHEME> 
+            <METHOD> IMEX </METHOD> 
+            <ORDER> 2 </ORDER> 
+        </TIMEINTEGRATIONSCHEME>
+
         <PARAMETERS>
             <P> TimeStep      = 0.0008 </P>
             <P> NumSteps      = 1250 </P>
diff --git a/flow-stability/cylinder/flow-stability-cylinder/tutorial/base/Cylinder-Base.xml b/flow-stability/cylinder/flow-stability-cylinder/tutorial/base/Cylinder-Base.xml
index 553deeebb90b2992ff7c35ae4806df8bcf392693..3e142cb1d5ffe39d4f2b4d7219b41a517dc399f7 100644
--- a/flow-stability/cylinder/flow-stability-cylinder/tutorial/base/Cylinder-Base.xml
+++ b/flow-stability/cylinder/flow-stability-cylinder/tutorial/base/Cylinder-Base.xml
@@ -11,10 +11,14 @@
             <I PROPERTY="EQTYPE"                  VALUE="UnsteadyNavierStokes"    />
             <I PROPERTY="Projection"              VALUE="Continuous"              />
             <I PROPERTY="EvolutionOperator"       VALUE="Nonlinear"               />
-            <I PROPERTY="TimeIntegrationMethod"   VALUE="IMEXOrder2"              />
             <I PROPERTY="Driver"                  VALUE="Standard"                />
         </SOLVERINFO>
 
+        <TIMEINTEGRATIONSCHEME> 
+            <METHOD> IMEX </METHOD> 
+            <ORDER> 2 </ORDER> 
+        </TIMEINTEGRATIONSCHEME>
+
         <PARAMETERS>
             <P> TimeStep      = 0.0008    </P>
             <P> NumSteps      = 625000    </P>
diff --git a/flow-stability/cylinder/flow-stability-cylinder/tutorial/stability/Adjoint/Cylinder_Adjoint.xml b/flow-stability/cylinder/flow-stability-cylinder/tutorial/stability/Adjoint/Cylinder_Adjoint.xml
index d0980d9faefca7a2d8faf108a1a096a01ca17a01..bfdb09e8ced0b47b5122152ec5ccb5e18cf5ef49 100644
--- a/flow-stability/cylinder/flow-stability-cylinder/tutorial/stability/Adjoint/Cylinder_Adjoint.xml
+++ b/flow-stability/cylinder/flow-stability-cylinder/tutorial/stability/Adjoint/Cylinder_Adjoint.xml
@@ -6,11 +6,15 @@
             <I PROPERTY="EQTYPE"                VALUE="UnsteadyNavierStokes"    />
             <I PROPERTY="EvolutionOperator"     VALUE="..."                 />
             <I PROPERTY="Projection"            VALUE="Galerkin"                />
-            <I PROPERTY="TimeIntegrationMethod" VALUE="IMEXOrder3"              />
             <I PROPERTY="Driver"                VALUE="Arpack"                  />
             <I PROPERTY="ArpackProblemType"     VALUE="LargestMag"              />
         </SOLVERINFO>
 
+        <TIMEINTEGRATIONSCHEME> 
+            <METHOD> IMEX </METHOD> 
+            <ORDER> 3 </ORDER> 
+        </TIMEINTEGRATIONSCHEME>
+
         <PARAMETERS>
             <P> TimeStep      = 0.001               </P>
             <P> FinalTime     = 1                   </P>
diff --git a/flow-stability/cylinder/flow-stability-cylinder/tutorial/stability/Direct/Cylinder_Direct.xml b/flow-stability/cylinder/flow-stability-cylinder/tutorial/stability/Direct/Cylinder_Direct.xml
index 57476f82743f32f8b1e027e24a0cd46982b54f6b..bfba31bb41e7adf868593df491c5224cfef0f742 100644
--- a/flow-stability/cylinder/flow-stability-cylinder/tutorial/stability/Direct/Cylinder_Direct.xml
+++ b/flow-stability/cylinder/flow-stability-cylinder/tutorial/stability/Direct/Cylinder_Direct.xml
@@ -6,11 +6,15 @@
             <I PROPERTY="EQTYPE"                  VALUE="UnsteadyNavierStokes"    />
             <I PROPERTY="EvolutionOperator"       VALUE="Direct"                  />
             <I PROPERTY="Projection"              VALUE="Galerkin"                />
-            <I PROPERTY="TimeIntegrationMethod"   VALUE="IMEXOrder2"              />
             <I PROPERTY="Driver"                  VALUE="..."                  />
             <I PROPERTY="ArpackProblemType"       VALUE="LargestMag"              />
         </SOLVERINFO>
 
+        <TIMEINTEGRATIONSCHEME> 
+            <METHOD> IMEX </METHOD> 
+            <ORDER> 2 </ORDER> 
+        </TIMEINTEGRATIONSCHEME>
+
         <PARAMETERS>
             <P> TimeStep      = 0.0008    </P>
             <P> NumSteps      = 1250      </P>
@@ -18,7 +22,6 @@
             <P> IO_InfoSteps  = 1250      </P>
             <P> Re            = 42        </P>
             <P> Kinvis        = 1./Re     </P>
-            ...
             <P> nvec          = 2         </P>
             <P> evtol         = 1e-6      </P>
         </PARAMETERS>
diff --git a/flow-stability/cylinder/flow-stability-cylinder/tutorial/stability/Receptivity/Cylinder_Direct.xml b/flow-stability/cylinder/flow-stability-cylinder/tutorial/stability/Receptivity/Cylinder_Direct.xml
index 98b2a9e3a443b32ea9b581d9b8eda1544ec6c031..9588075ee3527d8605bdc98ab7912d01db1af39d 100644
--- a/flow-stability/cylinder/flow-stability-cylinder/tutorial/stability/Receptivity/Cylinder_Direct.xml
+++ b/flow-stability/cylinder/flow-stability-cylinder/tutorial/stability/Receptivity/Cylinder_Direct.xml
@@ -10,11 +10,15 @@
             <I PROPERTY="EQTYPE" VALUE="UnsteadyNavierStokes"/>
             <I PROPERTY="EvolutionOperator" VALUE="Direct"/>
             <I PROPERTY="Projection" VALUE="Galerkin"/>
-            <I PROPERTY="TimeIntegrationMethod" VALUE="IMEXOrder2"/>
             <I PROPERTY="Driver" VALUE="Arpack" />
             <I PROPERTY="ArpackProblemType" VALUE="LargestMag" />
         </SOLVERINFO>
 
+        <TIMEINTEGRATIONSCHEME> 
+            <METHOD> IMEX </METHOD> 
+            <ORDER> 2 </ORDER> 
+        </TIMEINTEGRATIONSCHEME>
+
         <PARAMETERS>
             <P> TimeStep      = 0.0008 </P>
             <P> NumSteps      = 1250 </P>
diff --git a/incns/rbc/rbc/completed/DNS/Ra_1e4_Pr0p71/rbc-DNS.xml b/incns/rbc/rbc/completed/DNS/Ra_1e4_Pr0p71/rbc-DNS.xml
index 5957ba90291f1f2d7e73349d264fb2aa4c7dde71..3d5d0e36a2b4422d1e9696e1ab4805483b60bafd 100644
--- a/incns/rbc/rbc/completed/DNS/Ra_1e4_Pr0p71/rbc-DNS.xml
+++ b/incns/rbc/rbc/completed/DNS/Ra_1e4_Pr0p71/rbc-DNS.xml
@@ -9,12 +9,16 @@
         <SOLVERINFO>
           <I PROPERTY="SOLVERTYPE"              VALUE="VelocityCorrectionScheme"/>
           <I PROPERTY="EQTYPE"                  VALUE="UnsteadyNavierStokes"    />
-          <I PROPERTY="TimeIntegrationMethod"   VALUE="IMEXOrder3"              />
           <I PROPERTY="EvolutionOperator"       VALUE="Nonlinear"               />
           <I PROPERTY="Projection"              VALUE="Continuous"              />
           <I PROPERTY="Driver"                  VALUE="Standard"                />
         </SOLVERINFO>
 
+        <TIMEINTEGRATIONSCHEME> 
+            <METHOD> IMEX </METHOD> 
+            <ORDER> 3 </ORDER> 
+        </TIMEINTEGRATIONSCHEME>
+
         <PARAMETERS>
             <P> TimeStep      = 0.0005   </P>
             <P> T_Final = 10</P>
diff --git a/incns/rbc/rbc/completed/DNS/Ra_3e3_Pr_7/rbc-DNS.xml b/incns/rbc/rbc/completed/DNS/Ra_3e3_Pr_7/rbc-DNS.xml
index e6a5d9ad019a2d425ae5b33a95cb577620692b47..dc9096eb928846659c3e54dcc71f4cd21c710a93 100644
--- a/incns/rbc/rbc/completed/DNS/Ra_3e3_Pr_7/rbc-DNS.xml
+++ b/incns/rbc/rbc/completed/DNS/Ra_3e3_Pr_7/rbc-DNS.xml
@@ -9,12 +9,16 @@
         <SOLVERINFO>
           <I PROPERTY="SOLVERTYPE"              VALUE="VelocityCorrectionScheme"/>
           <I PROPERTY="EQTYPE"                  VALUE="UnsteadyNavierStokes"    />
-          <I PROPERTY="TimeIntegrationMethod"   VALUE="IMEXOrder3"              />
           <I PROPERTY="EvolutionOperator"       VALUE="Nonlinear"               />
           <I PROPERTY="Projection"              VALUE="Continuous"              />
           <I PROPERTY="Driver"                  VALUE="Standard"                />
         </SOLVERINFO>
 
+        <TIMEINTEGRATIONSCHEME> 
+            <METHOD> IMEX </METHOD> 
+            <ORDER> 3 </ORDER> 
+        </TIMEINTEGRATIONSCHEME>
+
         <PARAMETERS>
             <P> TimeStep      = 0.001   </P>
             <P> T_Final = 10</P>
diff --git a/incns/rbc/rbc/completed/DNS/Ra_5e3_Pr0p71/rbc-DNS.xml b/incns/rbc/rbc/completed/DNS/Ra_5e3_Pr0p71/rbc-DNS.xml
index 9a94ccf35f59485bd80e36c363054da3ea1905ed..0a6e1b32182d5ea43c583e0d42f3d2c9b0c67320 100644
--- a/incns/rbc/rbc/completed/DNS/Ra_5e3_Pr0p71/rbc-DNS.xml
+++ b/incns/rbc/rbc/completed/DNS/Ra_5e3_Pr0p71/rbc-DNS.xml
@@ -9,12 +9,16 @@
         <SOLVERINFO>
           <I PROPERTY="SOLVERTYPE"              VALUE="VelocityCorrectionScheme"/>
           <I PROPERTY="EQTYPE"                  VALUE="UnsteadyNavierStokes"    />
-          <I PROPERTY="TimeIntegrationMethod"   VALUE="IMEXOrder3"              />
           <I PROPERTY="EvolutionOperator"       VALUE="Nonlinear"               />
           <I PROPERTY="Projection"              VALUE="Continuous"              />
           <I PROPERTY="Driver"                  VALUE="Standard"                />
         </SOLVERINFO>
 
+        <TIMEINTEGRATIONSCHEME> 
+            <METHOD> IMEX </METHOD> 
+            <ORDER> 3 </ORDER> 
+        </TIMEINTEGRATIONSCHEME>
+
         <PARAMETERS>
             <P> TimeStep      = 0.001   </P>
             <P> T_Final = 10</P>
diff --git a/incns/rbc/rbc/completed/LSA/Ra1600/rbc-LSA.xml b/incns/rbc/rbc/completed/LSA/Ra1600/rbc-LSA.xml
index 75b74992fd542c18cbec59ac238c70f827b5c012..803a2f4574a88cfd894b2c0db0a67e941df8c274 100644
--- a/incns/rbc/rbc/completed/LSA/Ra1600/rbc-LSA.xml
+++ b/incns/rbc/rbc/completed/LSA/Ra1600/rbc-LSA.xml
@@ -9,12 +9,15 @@
         <SOLVERINFO>
           <I PROPERTY="SOLVERTYPE"              VALUE="VelocityCorrectionScheme"/>
           <I PROPERTY="EQTYPE"                  VALUE="UnsteadyNavierStokes"    />
-          <I PROPERTY="TimeIntegrationMethod"   VALUE="IMEXOrder3"              />
           <I PROPERTY="Projection"              VALUE="Continuous"              />
           <I PROPERTY="EvolutionOperator"       VALUE="Direct"               />
           <I PROPERTY="Driver"                  VALUE="ModifiedArnoldi"                />
         </SOLVERINFO>
 
+        <TIMEINTEGRATIONSCHEME> 
+            <METHOD> IMEX </METHOD> 
+            <ORDER> 3 </ORDER> 
+        </TIMEINTEGRATIONSCHEME>
 
         <PARAMETERS>
             <P> TimeStep      = 0.001   </P>
diff --git a/incns/rbc/rbc/completed/LSA/Ra1700/rbc-LSA.xml b/incns/rbc/rbc/completed/LSA/Ra1700/rbc-LSA.xml
index 62f87336a1f550ec005270dfdcda25329b94b405..b17d16df32c67879f2c020de5dc1a2eda31fdba6 100644
--- a/incns/rbc/rbc/completed/LSA/Ra1700/rbc-LSA.xml
+++ b/incns/rbc/rbc/completed/LSA/Ra1700/rbc-LSA.xml
@@ -9,12 +9,15 @@
         <SOLVERINFO>
           <I PROPERTY="SOLVERTYPE"              VALUE="VelocityCorrectionScheme"/>
           <I PROPERTY="EQTYPE"                  VALUE="UnsteadyNavierStokes"    />
-          <I PROPERTY="TimeIntegrationMethod"   VALUE="IMEXOrder3"              />
           <I PROPERTY="Projection"              VALUE="Continuous"              />
           <I PROPERTY="EvolutionOperator"       VALUE="Direct"               />
           <I PROPERTY="Driver"                  VALUE="ModifiedArnoldi"                />
         </SOLVERINFO>
 
+        <TIMEINTEGRATIONSCHEME> 
+            <METHOD> IMEX </METHOD> 
+            <ORDER> 3 </ORDER> 
+        </TIMEINTEGRATIONSCHEME>
 
         <PARAMETERS>
             <P> TimeStep      = 0.001   </P>
diff --git a/incns/rbc/rbc/completed/LSA/Ra1800/rbc-LSA.xml b/incns/rbc/rbc/completed/LSA/Ra1800/rbc-LSA.xml
index 58f8a38e4cf9d35be3189af7d98e5b5ec9669fb5..767351d3d511cb26026feecd2f0d15c2dbaf854e 100644
--- a/incns/rbc/rbc/completed/LSA/Ra1800/rbc-LSA.xml
+++ b/incns/rbc/rbc/completed/LSA/Ra1800/rbc-LSA.xml
@@ -9,12 +9,15 @@
         <SOLVERINFO>
           <I PROPERTY="SOLVERTYPE"              VALUE="VelocityCorrectionScheme"/>
           <I PROPERTY="EQTYPE"                  VALUE="UnsteadyNavierStokes"    />
-          <I PROPERTY="TimeIntegrationMethod"   VALUE="IMEXOrder3"              />
           <I PROPERTY="Projection"              VALUE="Continuous"              />
           <I PROPERTY="EvolutionOperator"       VALUE="Direct"               />
           <I PROPERTY="Driver"                  VALUE="ModifiedArnoldi"                />
         </SOLVERINFO>
 
+        <TIMEINTEGRATIONSCHEME> 
+            <METHOD> IMEX </METHOD> 
+            <ORDER> 3 </ORDER> 
+        </TIMEINTEGRATIONSCHEME>
 
         <PARAMETERS>
             <P> TimeStep      = 0.001   </P>
diff --git a/incns/rbc/rbc/completed/LSA/Ra1900/rbc-LSA.xml b/incns/rbc/rbc/completed/LSA/Ra1900/rbc-LSA.xml
index c33289758ac18d1fa931f694d2fcb2b3ecf739df..0d9bdcb32096098a434f6abbbb4b0b22d5ad0fa6 100644
--- a/incns/rbc/rbc/completed/LSA/Ra1900/rbc-LSA.xml
+++ b/incns/rbc/rbc/completed/LSA/Ra1900/rbc-LSA.xml
@@ -9,12 +9,15 @@
         <SOLVERINFO>
           <I PROPERTY="SOLVERTYPE"              VALUE="VelocityCorrectionScheme"/>
           <I PROPERTY="EQTYPE"                  VALUE="UnsteadyNavierStokes"    />
-          <I PROPERTY="TimeIntegrationMethod"   VALUE="IMEXOrder3"              />
           <I PROPERTY="Projection"              VALUE="Continuous"              />
           <I PROPERTY="EvolutionOperator"       VALUE="Direct"               />
           <I PROPERTY="Driver"                  VALUE="ModifiedArnoldi"                />
         </SOLVERINFO>
 
+        <TIMEINTEGRATIONSCHEME> 
+            <METHOD> IMEX </METHOD> 
+            <ORDER> 3 </ORDER> 
+        </TIMEINTEGRATIONSCHEME>
 
         <PARAMETERS>
             <P> TimeStep      = 0.001   </P>
diff --git a/incns/rbc/rbc/tutorial/DNS/Ra_5e3_Pr_0p71/rbc-DNS.xml b/incns/rbc/rbc/tutorial/DNS/Ra_5e3_Pr_0p71/rbc-DNS.xml
index 0460c9182bb74f8cbe831cdc39748f9d41404ecd..bea67bf28b0b4c07691cbdb79795208f59ba3052 100644
--- a/incns/rbc/rbc/tutorial/DNS/Ra_5e3_Pr_0p71/rbc-DNS.xml
+++ b/incns/rbc/rbc/tutorial/DNS/Ra_5e3_Pr_0p71/rbc-DNS.xml
@@ -9,16 +9,18 @@
         <SOLVERINFO>
           <I PROPERTY="SOLVERTYPE"              VALUE="VelocityCorrectionScheme"/>
           <I PROPERTY="EQTYPE"                  VALUE="UnsteadyNavierStokes"    />
-          <I PROPERTY="TimeIntegrationMethod"   VALUE="IMEXOrder3"              />
-          ...
         </SOLVERINFO>
+
+        <TIMEINTEGRATIONSCHEME> 
+            <METHOD> IMEX </METHOD> 
+            <ORDER> 3 </ORDER> 
+        </TIMEINTEGRATIONSCHEME>
         
         <PARAMETERS>
             <P> TimeStep      = 0.001   </P>
             <P> T_Final = 10</P>
             <P> NumSteps      = T_Final/TimeStep     </P>
             <P> IO_InfoSteps  = 100       </P>
-            ...
             <P> Kinvis        = Pr    </P>
         </PARAMETERS>
         
diff --git a/incns/rbc/rbc/tutorial/LSA/Ra_1900/rbc-LSA.xml b/incns/rbc/rbc/tutorial/LSA/Ra_1900/rbc-LSA.xml
index 3925513714a12ceb6fa951bb78740d7c446b2b13..2d7c276598ad6714365b1fe821c4bc5279189298 100644
--- a/incns/rbc/rbc/tutorial/LSA/Ra_1900/rbc-LSA.xml
+++ b/incns/rbc/rbc/tutorial/LSA/Ra_1900/rbc-LSA.xml
@@ -9,11 +9,14 @@
         <SOLVERINFO>
           <I PROPERTY="SOLVERTYPE"              VALUE="VelocityCorrectionScheme"/>
           <I PROPERTY="EQTYPE"                  VALUE="UnsteadyNavierStokes"    />
-          <I PROPERTY="TimeIntegrationMethod"   VALUE="IMEXOrder3"              />
           <I PROPERTY="Projection"              VALUE="Continuous"              />
-          ...
         </SOLVERINFO>
 
+        <TIMEINTEGRATIONSCHEME> 
+            <METHOD> IMEX </METHOD> 
+            <ORDER> 3 </ORDER> 
+        </TIMEINTEGRATIONSCHEME>
+
         <PARAMETERS>
             <P> TimeStep      = 0.001   </P>
             <P> T_Final = 0.1</P>
@@ -22,7 +25,6 @@
             <P> Ra            = 1900      </P>
             <P> Pr            = 0.71      </P>
             <P> Kinvis        = Pr    </P>
-            ...
         </PARAMETERS>
 
         <VARIABLES>
diff --git a/incns/taylor-green-vortex/incns-taylor-green-vortex.tex b/incns/taylor-green-vortex/incns-taylor-green-vortex.tex
index 5002fe9e95c558f2e7529eb7929169a1a9748881..abda49d45fc1ac8c1314dfe9b6829afdee30b27e 100644
--- a/incns/taylor-green-vortex/incns-taylor-green-vortex.tex
+++ b/incns/taylor-green-vortex/incns-taylor-green-vortex.tex
@@ -337,7 +337,6 @@ approach to be used when solving linear matrix systems of the form $Ax=b$ that a
 \begin{tutorialtask}
 In the file \texttt{TGV64\_conditions.xml} under the tag \inltt{SOLVERINFO}, define all the solver properties. These include:
 \begin{itemize}
-\item Setting the \texttt{TimeIntegrationMethod} to \texttt{IMEXOrder2}. 
 \item Setting the \texttt{SolverType} to \texttt{VelocityCorrectionScheme} and the \texttt{EqType} to \texttt{UnsteadyNavierStokes}.
 \item (Optional) Setting the \texttt{UseFFT} property to \texttt{True} to indicate that the
     Fast Fourier Transform method will be used to speed up the operations
diff --git a/incns/taylor-green-vortex/incns-taylor-green-vortex/completed/solver128/TGV128_conditions.xml b/incns/taylor-green-vortex/incns-taylor-green-vortex/completed/solver128/TGV128_conditions.xml
index 26b80bf80bc0b97eaa37323b2a4b9b368e603b73..beb93c46dbd09c3e06f689ea371bd203135432a4 100644
--- a/incns/taylor-green-vortex/incns-taylor-green-vortex/completed/solver128/TGV128_conditions.xml
+++ b/incns/taylor-green-vortex/incns-taylor-green-vortex/completed/solver128/TGV128_conditions.xml
@@ -21,13 +21,16 @@
             <I PROPERTY="EqType"                VALUE="UnsteadyNavierStokes"       />
             <I PROPERTY="AdvectionForm"         VALUE="Convective"                 />
             <I PROPERTY="Projection"            VALUE="Galerkin"                   />
-            <I PROPERTY="TimeIntegrationMethod" VALUE="IMEXOrder2"                 />
             <I PROPERTY="Homogeneous"           VALUE="1D"                         />
             <!-- <I PROPERTY="UseFFT"                VALUE="FFTW"                       /> -->
             <I PROPERTY="GlobalSysSoln"         VALUE="DirectMultiLevelStaticCond" />
             <I PROPERTY="SpectralHPDealiasing" 	VALUE="True" />
             <I PROPERTY="SpectralVanishingViscosity"         VALUE="False" />
         </SOLVERINFO>
+        <TIMEINTEGRATIONSCHEME> 
+            <METHOD> IMEX </METHOD> 
+            <ORDER> 2 </ORDER> 
+        </TIMEINTEGRATIONSCHEME>
         <PARAMETERS>
             <P> TimeStep       = 0.005    </P>
             <P> FinalTime      = 20.0     </P>
diff --git a/incns/taylor-green-vortex/incns-taylor-green-vortex/completed/solver64/TGV64_conditions.xml b/incns/taylor-green-vortex/incns-taylor-green-vortex/completed/solver64/TGV64_conditions.xml
index 9e0fb7afab8145aa240ea9959f99c4e848213c29..573810cdadba9285f21570d0c769b9511637b885 100644
--- a/incns/taylor-green-vortex/incns-taylor-green-vortex/completed/solver64/TGV64_conditions.xml
+++ b/incns/taylor-green-vortex/incns-taylor-green-vortex/completed/solver64/TGV64_conditions.xml
@@ -21,13 +21,16 @@
             <I PROPERTY="EqType"                VALUE="UnsteadyNavierStokes"       />
             <I PROPERTY="AdvectionForm"         VALUE="Convective"                 />
             <I PROPERTY="Projection"            VALUE="Galerkin"                   />
-            <I PROPERTY="TimeIntegrationMethod" VALUE="IMEXOrder2"                 />
             <I PROPERTY="Homogeneous"           VALUE="1D"                         />
             <!-- <I PROPERTY="UseFFT"                VALUE="FFTW"                       /> -->
             <I PROPERTY="GlobalSysSoln"         VALUE="DirectMultiLevelStaticCond" />
             <I PROPERTY="SpectralHPDealiasing" 	VALUE="True" />
             <I PROPERTY="SpectralVanishingViscosity"         VALUE="True" />
         </SOLVERINFO>
+        <TIMEINTEGRATIONSCHEME> 
+            <METHOD> IMEX </METHOD> 
+            <ORDER> 2 </ORDER> 
+        </TIMEINTEGRATIONSCHEME>
         <PARAMETERS>
             <P> TimeStep       = 0.01    </P>
             <P> FinalTime      = 20.0     </P>
diff --git a/mesh-generation/2d-naca/mesh-generation-2d-naca/completed/session_naca.xml b/mesh-generation/2d-naca/mesh-generation-2d-naca/completed/session_naca.xml
index 960062a38ac5761c82a8424ed84f81d77780ad6a..d6ef463a7cd0cadf39afe1ab169930816042b3dd 100644
--- a/mesh-generation/2d-naca/mesh-generation-2d-naca/completed/session_naca.xml
+++ b/mesh-generation/2d-naca/mesh-generation-2d-naca/completed/session_naca.xml
@@ -13,8 +13,12 @@
             <I PROPERTY="EQTYPE" VALUE="UnsteadyNavierStokes" />
             <I PROPERTY="AdvectionForm" VALUE="Convective" />
             <I PROPERTY="Projection" VALUE="Galerkin" />
-            <I PROPERTY="TimeIntegrationMethod" VALUE="IMEXOrder2" />
         </SOLVERINFO>
+ 
+        <TIMEINTEGRATIONSCHEME> 
+            <METHOD> IMEX </METHOD> 
+            <ORDER> 2 </ORDER> 
+        </TIMEINTEGRATIONSCHEME>
 
         <PARAMETERS>
             <P> TimeStep = 0.0005     </P>
diff --git a/mesh-generation/2d-naca/mesh-generation-2d-naca/tutorial/session_naca.xml b/mesh-generation/2d-naca/mesh-generation-2d-naca/tutorial/session_naca.xml
index fd09b48e14593d78ca346cfe4d0d4f1fc01926d2..49822eb35cfdddecc470d986f8a2b7952cb783f6 100644
--- a/mesh-generation/2d-naca/mesh-generation-2d-naca/tutorial/session_naca.xml
+++ b/mesh-generation/2d-naca/mesh-generation-2d-naca/tutorial/session_naca.xml
@@ -13,8 +13,12 @@
             <I PROPERTY="EQTYPE" VALUE="UnsteadyNavierStokes" />
             <I PROPERTY="AdvectionForm" VALUE="Convective" />
             <I PROPERTY="Projection" VALUE="Galerkin" />
-            <I PROPERTY="TimeIntegrationMethod" VALUE="IMEXOrder2" />
         </SOLVERINFO>
+ 
+        <TIMEINTEGRATIONSCHEME> 
+            <METHOD> IMEX </METHOD> 
+            <ORDER> 2 </ORDER> 
+        </TIMEINTEGRATIONSCHEME>
 
         <PARAMETERS>
             <P> TimeStep = 0.0005     </P>
diff --git a/mesh-generation/2d-step/mesh-generation-2d-step/completed/session_cyl.xml b/mesh-generation/2d-step/mesh-generation-2d-step/completed/session_cyl.xml
index 1dd128964438bf0c6d95cfb2ed920526e00443d2..9d76b277fef0563e2026f88bd9a51b0c45801eff 100644
--- a/mesh-generation/2d-step/mesh-generation-2d-step/completed/session_cyl.xml
+++ b/mesh-generation/2d-step/mesh-generation-2d-step/completed/session_cyl.xml
@@ -13,8 +13,12 @@
             <I PROPERTY="EQTYPE" VALUE="UnsteadyNavierStokes" />
             <I PROPERTY="AdvectionForm" VALUE="Convective" />
             <I PROPERTY="Projection" VALUE="Galerkin" />
-            <I PROPERTY="TimeIntegrationMethod" VALUE="IMEXOrder2" />
         </SOLVERINFO>
+ 
+        <TIMEINTEGRATIONSCHEME> 
+            <METHOD> IMEX </METHOD> 
+            <ORDER> 2 </ORDER> 
+        </TIMEINTEGRATIONSCHEME>
 
         <PARAMETERS>
             <P> TimeStep = 0.01     </P>
diff --git a/mesh-generation/2d-step/mesh-generation-2d-step/tutorial/session_cyl.xml b/mesh-generation/2d-step/mesh-generation-2d-step/tutorial/session_cyl.xml
index 1dd128964438bf0c6d95cfb2ed920526e00443d2..9d76b277fef0563e2026f88bd9a51b0c45801eff 100644
--- a/mesh-generation/2d-step/mesh-generation-2d-step/tutorial/session_cyl.xml
+++ b/mesh-generation/2d-step/mesh-generation-2d-step/tutorial/session_cyl.xml
@@ -13,8 +13,12 @@
             <I PROPERTY="EQTYPE" VALUE="UnsteadyNavierStokes" />
             <I PROPERTY="AdvectionForm" VALUE="Convective" />
             <I PROPERTY="Projection" VALUE="Galerkin" />
-            <I PROPERTY="TimeIntegrationMethod" VALUE="IMEXOrder2" />
         </SOLVERINFO>
+ 
+        <TIMEINTEGRATIONSCHEME> 
+            <METHOD> IMEX </METHOD> 
+            <ORDER> 2 </ORDER> 
+        </TIMEINTEGRATIONSCHEME>
 
         <PARAMETERS>
             <P> TimeStep = 0.01     </P>