diff --git a/swarmlab/Makefile b/swarmlab/Makefile
index 351f6d3..8d789ff 100644
--- a/swarmlab/Makefile
+++ b/swarmlab/Makefile
@@ -1,17 +1,11 @@
 config:
 
-	IP_ADDR=$(ip addr show | grep "inet " | grep  "eth0" | awk '{print $2}')
-	nmap -sP $IP_ADDR  | grep ondemand_mpi_worker | awk  -F "[()]" '{ for (i=2; i<NF; i+=2) print $i }' > /project/hosts
+	/bin/bash ./runbefore
 
 run:
 
-	sudo -u mpi mpicc -o /project/mpi_hello_world ../examples/mpi_hello_world.c
-sudo -u mpi scp /project/mpi_hello_world mpi@10.0.8.10:/project/mpi_hello_world
-	sudo -u mpi scp /project/mpi_hello_world mpi@10.0.8.11:/project/mpi_hello_world
-	cd /project
-	sudo -u mpi mpirun -n 10 -f /project/hosts  /project/mpi_hello_world  2>&1 | tee /tmp/output.log
-
+	/bin/bash ./run
 
 log:
 
-	cat /project/output.log
+	/bin/bash ./runafter