diff --git a/eddy/feedsRun.EddyLSRTest b/eddy/feedsRun.EddyLSRTest
index fd8212f708b630c4dabb4e18c2496b0069071838..2006a708778072759d8f8d0584b4b50640d5c859 100755
--- a/eddy/feedsRun.EddyLSRTest
+++ b/eddy/feedsRun.EddyLSRTest
@@ -49,7 +49,7 @@ eddy_args="--imain=${indir}/EddyLSRTestData/eddyData/testData
            --dont_peas --very_verbose"
 
 # run eddy
-${thisdir}/runEddy ${exedir} ${odir} ${eddy_args} > ${odir}/EddyLSRTest.runEddy.o$$
+${thisdir}/runEddy ${exedir} ${odir} ${eddy_args} | tee ${odir}/EddyLSRTest.runEddy.o$$
 output_prefixes=$(tail -n1 ${odir}/EddyLSRTest.runEddy.o$$)
 
 
diff --git a/eddy/feedsRun.EddyMBSTest b/eddy/feedsRun.EddyMBSTest
index 488fdf85b6c4ae9b7e51fd0f04eff4c29ed3470e..bae58d6a8eaad098e30afc8b6727e49822c37e83 100755
--- a/eddy/feedsRun.EddyMBSTest
+++ b/eddy/feedsRun.EddyMBSTest
@@ -55,7 +55,7 @@ eddy_args="--imain=${indir}/EddyMBSTestData/eddyData/testData
            --mbs_niter=20 --mbs_lambda=10 --mbs_ksp=10 --very_verbose"
 
 # run eddy
-${thisdir}/runEddy ${exedir} ${odir} ${eddy_args} > ${odir}/EddyMBSTest.runEddy.o$$
+${thisdir}/runEddy ${exedir} ${odir} ${eddy_args} | tee ${odir}/EddyMBSTest.runEddy.o$$
 output_prefixes=$(tail -n1 ${odir}/EddyMBSTest.runEddy.o$$)
 
 # Define some constants
diff --git a/eddy/feedsRun.EddyS2VTest b/eddy/feedsRun.EddyS2VTest
index 6d79f0df2b4806d768292c4db44159f287b2896f..9c4bf8006883b8a06d84d9f10e84cbca978849a0 100755
--- a/eddy/feedsRun.EddyS2VTest
+++ b/eddy/feedsRun.EddyS2VTest
@@ -53,7 +53,7 @@ eddy_args="--imain=${indir}/EddyS2VTestData/eddyData/testData
            --slspec=${indir}/EddyS2VTestData/eddyData/testSlspec  "
 
 # run eddy
-${thisdir}/runEddy ${exedir} ${odir} ${eddy_args} > ${odir}/EddyS2VTest.runEddy.o$$
+${thisdir}/runEddy ${exedir} ${odir} ${eddy_args} | tee ${odir}/EddyS2VTest.runEddy.o$$
 output_prefixes=$(tail -n1 ${odir}/EddyS2VTest.runEddy.o$$)
 
 # Define some constants
diff --git a/eddy/feedsRun.EddyTest b/eddy/feedsRun.EddyTest
index 6edd25f6e48e6f9d4183775aa086eaf077df1b57..ac0d677ab3c9851b733f20be2c513a2b044580cd 100755
--- a/eddy/feedsRun.EddyTest
+++ b/eddy/feedsRun.EddyTest
@@ -46,7 +46,7 @@ eddy_args="--imain=${indir}/EddyTestData/eddyData/testData
            --repol --fwhm=10,0,0,0,0 --dfields -v"
 
 # run eddy
-${thisdir}/runEddy ${exedir} ${odir} ${eddy_args} > ${odir}/EddyTest.runEddy.o$$
+${thisdir}/runEddy ${exedir} ${odir} ${eddy_args} | tee ${odir}/EddyTest.runEddy.o$$
 output_prefixes=$(tail -n1 ${odir}/EddyTest.runEddy.o$$)
 
 # Define some constants
diff --git a/eddy/runEddy b/eddy/runEddy
index 24df8ae2c4a4508e065d86f023732a9dd8159256..6ec20d526eb1f728af1cf2c88170747302f5d564 100755
--- a/eddy/runEddy
+++ b/eddy/runEddy
@@ -56,6 +56,7 @@ fi
 # can qalter the openmp jobs below
 cuda_jids=""
 cpu_jids=""
+submitted=""
 for exe in ${cuda_exes} ${cpu_exes};
 do
   variant=`basename ${exe}`
@@ -77,6 +78,8 @@ do
     continue
   fi
 
+  submitted="${submitted} ${exe}"
+
   if [[ "${exe}" == *"cuda"* ]]; then
     cuda_jids="${cuda_jids} ${jid}"
   else
@@ -84,7 +87,7 @@ do
   fi
 done
 
-if [ "${cuda_jids}" == "" ] && [ "${cpu_jids}" == "" ]; then
+if [ "${submitted}" == "" ]; then
   echo "Unable to submit any eddy executables!"
   exit 1
 fi
@@ -123,7 +126,7 @@ fi
 # and check that the main output file
 # was created
 outputs=""
-for exe in ${cuda_exes} ${cpu_exes};
+for exe in ${submitted};
 do
   tmp=`basename ${exe}`
   variant=`echo ${tmp} | sed 's/eddy_//'`