diff --git a/templates/multinode.template b/templates/multinode.template
index abf1d3b..0f0d66a 100644
--- a/templates/multinode.template
+++ b/templates/multinode.template
@@ -3,13 +3,34 @@
 #SBATCH --output={output_dir}{job_name}_{n_procs}.out
 #SBATCH --error={err_dir}{job_name}_{n_procs}.err
 #SBATCH --nodes={n_nodes}
-#SBATCH --time=00:10:00
+#SBATCH --nodelist=f01[01-64]
+#SBATCH --time=00:30:00
 #SBATCH --export=NONE
+# SwitchName=fswibl01 Level=0 LinkSpeed=1 Nodes=f01[01-64]
+# SwitchName=fswibl02 Level=0 LinkSpeed=1 Nodes=f02[01-64]
+# SwitchName=fswibl03 Level=0 LinkSpeed=1 Nodes=f03[01-64]
+# SwitchName=fswibl04 Level=0 LinkSpeed=1 Nodes=f04[01-64]
+# SwitchName=fswibl05 Level=0 LinkSpeed=1 Nodes=f05[01-64]
+# SwitchName=fswibl06 Level=0 LinkSpeed=1 Nodes=f06[01-64]
+# SwitchName=fswibl07 Level=0 LinkSpeed=1 Nodes=f01[65-88],f02[65-88]
+# SwitchName=fswibl08 Level=0 LinkSpeed=1 Nodes=f03[65-88],f04[65-88],fritz[1-2]
+# SwitchName=fswibl09 Level=0 LinkSpeed=1 Nodes=f05[65-88],f06[65-88],fritz[3-4],fviz1
+# SwitchName=fswibl10 Level=0 LinkSpeed=1 Nodes=f07[01-64]
+# SwitchName=fswibl11 Level=0 LinkSpeed=1 Nodes=f08[01-64]
+# SwitchName=fswibl12 Level=0 LinkSpeed=1 Nodes=f09[01-64]
+# SwitchName=fswibl13 Level=0 LinkSpeed=1 Nodes=f10[01-64]
 
 unset SLURM_EXPORT_ENV
 
 module load intel intelmpi 
 
+# Enable tuned collectives
+export I_MPI_TUNING=on
+export I_MPI_TUNING_MODE=auto        # or 'collectives'
+
+# Options: 0=auto, 1=recursive doubling, 2=ring, 3=binomial tree, 4=scatter-allgather
+export I_MPI_COLL_ALLGATHER=2 
+export I_MPI_COLL_GATHER=2     
 
 OUTPUT_FILENAME="{data_dir}/{job_name}_$SLURM_JOB_ID.dat"
 
@@ -17,6 +38,5 @@ echo  "# CREATION_TIME : {time_stamp}" > $OUTPUT_FILENAME
 echo  "# N_NODES       : {n_nodes}" >> $OUTPUT_FILENAME
 echo  "# OFF_CACHE_FLAG  : {off_cache_flag}">> $OUTPUT_FILENAME
 
-srun --cpu-freq=2000000-2000000:performance -N {n_nodes} -n{n_procs} {bin} {job_name} -npmin {n_procs} {off_cache_flag} -mem 5 >> $OUTPUT_FILENAME 
-
+srun --cpu-freq=2000000-2000000:performance -N {n_nodes} -n{n_procs} {bin} {job_name} -npmin {n_procs} {off_cache_flag} -mem 2 -time 60 >> $OUTPUT_FILENAME 
 
diff --git a/templates/multinode_algs.template b/templates/multinode_algs.template
new file mode 100644
index 0000000..55cdb63
--- /dev/null
+++ b/templates/multinode_algs.template
@@ -0,0 +1,35 @@
+#!/bin/bash -l
+#SBATCH --job-name={job_name}_{n_procs}
+#SBATCH --output={output_dir}{job_name}_{n_procs}.out
+#SBATCH --error={err_dir}{job_name}_{n_procs}.err
+#SBATCH --nodes={n_nodes}
+#SBATCH --nodelist=f01[01-64]
+#SBATCH --time=00:30:00
+#SBATCH --export=NONE
+# SwitchName=fswibl01 Level=0 LinkSpeed=1 Nodes=f01[01-64]
+# SwitchName=fswibl02 Level=0 LinkSpeed=1 Nodes=f02[01-64]
+# SwitchName=fswibl03 Level=0 LinkSpeed=1 Nodes=f03[01-64]
+# SwitchName=fswibl04 Level=0 LinkSpeed=1 Nodes=f04[01-64]
+# SwitchName=fswibl05 Level=0 LinkSpeed=1 Nodes=f05[01-64]
+# SwitchName=fswibl06 Level=0 LinkSpeed=1 Nodes=f06[01-64]
+# SwitchName=fswibl07 Level=0 LinkSpeed=1 Nodes=f01[65-88],f02[65-88]
+# SwitchName=fswibl08 Level=0 LinkSpeed=1 Nodes=f03[65-88],f04[65-88],fritz[1-2]
+# SwitchName=fswibl09 Level=0 LinkSpeed=1 Nodes=f05[65-88],f06[65-88],fritz[3-4],fviz1
+# SwitchName=fswibl10 Level=0 LinkSpeed=1 Nodes=f07[01-64]
+# SwitchName=fswibl11 Level=0 LinkSpeed=1 Nodes=f08[01-64]
+# SwitchName=fswibl12 Level=0 LinkSpeed=1 Nodes=f09[01-64]
+# SwitchName=fswibl13 Level=0 LinkSpeed=1 Nodes=f10[01-64]
+unset SLURM_EXPORT_ENV
+
+module load intel intelmpi 
+
+export I_MPI_ADJUST_{capital_jobname}={algnumber}
+
+OUTPUT_FILENAME="{data_dir}/{job_name}_$SLURM_JOB_ID.dat"
+
+echo  "# CREATION_TIME : {time_stamp}" > $OUTPUT_FILENAME
+echo  "# N_NODES       : {n_nodes}" >> $OUTPUT_FILENAME
+echo  "# OFF_CACHE_FLAG  : {off_cache_flag}">> $OUTPUT_FILENAME
+
+srun --cpu-freq=2000000-2000000:performance -N {n_nodes} -n{n_procs} {bin} {job_name} -npmin {n_procs} {off_cache_flag} -mem 2 -time 60 >> $OUTPUT_FILENAME 
+