diff --git a/tools/check_interactions.sh b/tools/check_interactions.sh
index 24a534b154313927ee4b2a108d3da7ea5f4d1f31..d688e69bb36b628905668183989d08204604c631 100755
--- a/tools/check_interactions.sh
+++ b/tools/check_interactions.sh
@@ -20,7 +20,7 @@ cd examples/SedovBlast_3D/
 ./getGlass.sh
 python makeIC.py
 
-../swift -s -t 16 -n 5 sedov.yml -P SPH:h_tolerance:10 -P Snapshots:compression:7 
+../swift --hydro --threads=16 --steps=5 sedov.yml -P SPH:h_tolerance:10 -P Snapshots:compression:7 
 
 mv sedov_0000.hdf5 sedov_naive.hdf5
 
@@ -29,7 +29,7 @@ cd ../EAGLE_12/
 # Link to ICs
 ln -s /gpfs/data/Swift/web-storage/ICs/EAGLE_ICs_12.hdf5 EAGLE_ICs_12.hdf5
 
-../swift -s -t 16 -n 5 eagle_12.yml -P SPH:h_tolerance:10 -P Snapshots:compression:7
+../swift --hydro --threads=16 --steps=5 eagle_12.yml -P SPH:h_tolerance:10 -P Snapshots:compression:7
 
 mv eagle_0000.hdf5 eagle_12_naive.hdf5
 
@@ -45,13 +45,13 @@ make clean; make -j 6
 
 cd examples/SedovBlast_3D/
 
-../swift -s -t 16 -n 5 sedov.yml -P SPH:h_tolerance:10 -P Snapshots:compression:7
+../swift --hydro --threads=16 --steps=5 sedov.yml -P SPH:h_tolerance:10 -P Snapshots:compression:7
 
 mv sedov_0000.hdf5 sedov_serial.hdf5
 
 cd ../EAGLE_12/
 
-../swift -s -t 16 -n 5 eagle_12.yml -P SPH:h_tolerance:10 -P Snapshots:compression:7 
+../swift --hydro --threads=16 --steps=5 eagle_12.yml -P SPH:h_tolerance:10 -P Snapshots:compression:7 
 
 mv eagle_0000.hdf5 eagle_12_serial.hdf5
 
@@ -67,7 +67,7 @@ make clean; make -j 6
 
 cd examples/SedovBlast_3D/
 
-../swift -s -t 16 -n 5 sedov.yml -P SPH:h_tolerance:10 -P Snapshots:compression:7
+../swift --hydro --threads=16 --steps=5 sedov.yml -P SPH:h_tolerance:10 -P Snapshots:compression:7
 
 mv sedov_0000.hdf5 sedov_vec.hdf5
 
@@ -98,7 +98,7 @@ fi
 
 cd ../EAGLE_12/
 
-../swift -s -t 16 -n 5 eagle_12.yml -P SPH:h_tolerance:10 -P Snapshots:compression:7
+../swift --hydro --threads=16 --steps=5 eagle_12.yml -P SPH:h_tolerance:10 -P Snapshots:compression:7
 
 mv eagle_0000.hdf5 eagle_12_vec.hdf5
 
@@ -145,13 +145,13 @@ make clean; make -j 6
 
 cd examples/SedovBlast_3D/
 
-mpirun -np 4 ../swift_mpi -s -t 16 -n 5 sedov.yml -P SPH:h_tolerance:10 -P Snapshots:compression:7
+mpirun -np 4 ../swift_mpi --hydro --threads=16 --steps=5 sedov.yml -P SPH:h_tolerance:10 -P Snapshots:compression:7
 
 mv sedov_0000.hdf5 sedov_naive.hdf5
 
 cd ../EAGLE_12/
 
-mpirun -np 4 ../swift_mpi -s -t 16 -n 5 eagle_12.yml -P SPH:h_tolerance:10 -P Snapshots:compression:7
+mpirun -np 4 ../swift_mpi --hydro --threads=16 --steps=5 eagle_12.yml -P SPH:h_tolerance:10 -P Snapshots:compression:7
 
 mv eagle_0000.hdf5 eagle_12_naive.hdf5
 
@@ -167,13 +167,13 @@ make clean; make -j 6
 
 cd examples/SedovBlast_3D/
 
-mpirun -np 4 ../swift_mpi -s -t 16 -n 5 sedov.yml -P SPH:h_tolerance:10 -P Snapshots:compression:7
+mpirun -np 4 ../swift_mpi --hydro --threads=16 --steps=5 sedov.yml -P SPH:h_tolerance:10 -P Snapshots:compression:7
 
 mv sedov_0000.hdf5 sedov_serial.hdf5
 
 cd ../EAGLE_12/
 
-mpirun -np 4 ../swift_mpi -s -t 16 -n 5 eagle_12.yml -P SPH:h_tolerance:10 -P Snapshots:compression:7
+mpirun -np 4 ../swift_mpi --hydro --threads=16 --steps=5 eagle_12.yml -P SPH:h_tolerance:10 -P Snapshots:compression:7
 
 mv eagle_0000.hdf5 eagle_12_serial.hdf5
 
@@ -189,7 +189,7 @@ make clean; make -j 6
 
 cd examples/SedovBlast_3D/
 
-mpirun -np 4 ../swift_mpi -s -t 16 -n 5 sedov.yml -P SPH:h_tolerance:10 -P Snapshots:compression:7
+mpirun -np 4 ../swift_mpi --hydro --threads=16 --steps=5 sedov.yml -P SPH:h_tolerance:10 -P Snapshots:compression:7
 
 mv sedov_0000.hdf5 sedov_vec.hdf5
 
@@ -220,7 +220,7 @@ fi
 
 cd ../EAGLE_12/
 
-mpirun -np 4 ../swift_mpi -s -t 16 -n 5 eagle_12.yml -P SPH:h_tolerance:10 -P Snapshots:compression:7
+mpirun -np 4 ../swift_mpi --hydro --threads=16 --steps=5 eagle_12.yml -P SPH:h_tolerance:10 -P Snapshots:compression:7
 
 mv eagle_0000.hdf5 eagle_12_vec.hdf5