diff --git a/example/Grid/0_simple/Makefile b/example/Grid/0_simple/Makefile
index 927a794d2b42b777e0946ac63f508c180b333fae..26bd7de19ab527d116d6ee67307b07d016111c44 100644
--- a/example/Grid/0_simple/Makefile
+++ b/example/Grid/0_simple/Makefile
@@ -15,7 +15,7 @@ grid: $(OBJ)
 all: grid
 
 run: all
-	source $$HOME/openfpm_vars; mpirun -np 2 ./grid
+	mpirun -np 2 ./grid
 
 .PHONY: clean all run
 
diff --git a/example/Grid/1_stencil/Makefile b/example/Grid/1_stencil/Makefile
index 12399cc8db6278b2af91051f4d11a071bce0730d..bb7b0ec2e27f77da6ea3ebccae9f34147e128bf4 100644
--- a/example/Grid/1_stencil/Makefile
+++ b/example/Grid/1_stencil/Makefile
@@ -15,7 +15,7 @@ stencil: $(OBJ)
 all: stencil
 
 run: all
-	source $$HOME/openfpm_vars; mpirun -np 3 ./stencil
+	mpirun -np 3 ./stencil
 
 .PHONY: clean all run
 
diff --git a/example/Grid/2_solve_eq/Makefile b/example/Grid/2_solve_eq/Makefile
index 9295477e1029761cc9dbac6de7ff727df0114b21..9f4b7160aaedb1c193c95ca1d4bdf594176e6a97 100644
--- a/example/Grid/2_solve_eq/Makefile
+++ b/example/Grid/2_solve_eq/Makefile
@@ -15,7 +15,7 @@ periodic: $(OBJ)
 all: periodic
 
 run: all
-	source $$HOME/openfpm_vars; mpirun -np 4 ./periodic
+	mpirun -np 4 ./periodic
 
 .PHONY: clean all run
 
diff --git a/example/Grid/3_gray_scott/Makefile b/example/Grid/3_gray_scott/Makefile
index df84f0c12a5d30d2ee28986342a38ad054f6407a..170e428569ba200362dfa7bbc4a5d533f4006696 100644
--- a/example/Grid/3_gray_scott/Makefile
+++ b/example/Grid/3_gray_scott/Makefile
@@ -15,7 +15,7 @@ gray_scott: $(OBJ)
 all: gray_scott
 
 run: all
-	source $$HOME/openfpm_vars; mpirun -np 4 ./gray_scott
+	mpirun -np 4 ./gray_scott
 
 .PHONY: clean all run
 
diff --git a/example/Numerics/PSE/0_Derivative_approx_1D/Makefile b/example/Numerics/PSE/0_Derivative_approx_1D/Makefile
index 4399591ae91a611106e5536aa126a7b37fbbaf70..da76a97b081f678675d3c9ca416664098dcdd671 100644
--- a/example/Numerics/PSE/0_Derivative_approx_1D/Makefile
+++ b/example/Numerics/PSE/0_Derivative_approx_1D/Makefile
@@ -15,7 +15,7 @@ pse_1d: $(OBJ)
 all: pse_1d
 
 run: all
-	source $$HOME/openfpm_vars; ./pse_1d
+	./pse_1d
 
 .PHONY: clean all run
 
diff --git a/example/Numerics/PSE/1_Diffusion_1D/Makefile b/example/Numerics/PSE/1_Diffusion_1D/Makefile
index 80cc4ffee6942f9638dff20b8b6ef4fa3b122fb4..502affc0c3379bdd1e290d47424388bf2aa333ba 100644
--- a/example/Numerics/PSE/1_Diffusion_1D/Makefile
+++ b/example/Numerics/PSE/1_Diffusion_1D/Makefile
@@ -15,7 +15,7 @@ diff_1d: $(OBJ)
 all: diff_1d
 
 run: all
-	source $$HOME/openfpm_vars; mpirun -np 4 ./diff_1d
+	mpirun -np 4 ./diff_1d
 
 .PHONY: clean all
 
diff --git a/example/Numerics/Stoke_flow/0_2D_incompressible/Makefile b/example/Numerics/Stoke_flow/0_2D_incompressible/Makefile
index b6512e4ce8a11840a6ea123ee2a7d6c8b3330bd9..1378bd05620783aa79a98e4e354aa19131c86921 100644
--- a/example/Numerics/Stoke_flow/0_2D_incompressible/Makefile
+++ b/example/Numerics/Stoke_flow/0_2D_incompressible/Makefile
@@ -19,7 +19,7 @@ stokes_2d_petsc: $(OBJ_PETSC)
 	$(CC) -o $@ $^ $(CFLAGS) $(LIBS_PATH) $(LIBS)
 
 run: all
-	source $$HOME/openfpm_vars; mpirun -np 3 ./stokes_2d_eigen; mpirun -np 3 ./stokes_2d_petsc
+	mpirun -np 3 ./stokes_2d_eigen && mpirun -np 3 ./stokes_2d_petsc
 	
 .PHONY: clean all
 
diff --git a/example/Numerics/Stoke_flow/1_3D_incompressible/Makefile b/example/Numerics/Stoke_flow/1_3D_incompressible/Makefile
index 37f936486b6cc6be32d4a89c8f4f7a648d8cee14..5186ac565a358b610c6ed1df82c9dd83fb310bd4 100644
--- a/example/Numerics/Stoke_flow/1_3D_incompressible/Makefile
+++ b/example/Numerics/Stoke_flow/1_3D_incompressible/Makefile
@@ -19,7 +19,7 @@ stokes_3d_petsc: $(OBJ_PETSC)
 	$(CC) -o $@ $^ $(CFLAGS) $(LIBS_PATH) $(LIBS)
 
 run: all
-	source $$HOME/openfpm_vars; mpirun -np 3 ./stokes_3d_eigen; mpirun -np 3 ./stokes_3d_petsc
+	mpirun -np 3 ./stokes_3d_eigen && mpirun -np 3 ./stokes_3d_petsc
 	
 .PHONY: clean all run
 
diff --git a/example/Plot/0_simple_graph/Makefile b/example/Plot/0_simple_graph/Makefile
index 8fde20400ee465c23d63c2e06d8aa5e4edfe5646..e2885ae2a21a84bd8bb036284446869a47318c85 100644
--- a/example/Plot/0_simple_graph/Makefile
+++ b/example/Plot/0_simple_graph/Makefile
@@ -15,7 +15,7 @@ plot: $(OBJ)
 all: plot
 
 run: all
-	source $$HOME/openfpm_vars; ./plot
+	./plot
 
 .PHONY: clean all run
 
diff --git a/example/VCluster/0_simple/Makefile b/example/VCluster/0_simple/Makefile
index b54f7e1f340ba22c321088dc49992f4241f802e3..721c8d9f7e9f12f7260d5883ef719e5f8a02305c 100644
--- a/example/VCluster/0_simple/Makefile
+++ b/example/VCluster/0_simple/Makefile
@@ -15,7 +15,7 @@ vcluster: $(OBJ)
 all: vcluster
 
 run: all
-	source $$HOME/openfpm_vars; mpirun -np 3 ./vcluster
+	mpirun -np 3 ./vcluster
 
 .PHONY: clean all run
 
diff --git a/example/Vector/0_simple/Makefile b/example/Vector/0_simple/Makefile
index 646357e9532c2ba26a3df94534201be645d20608..741431e3ec68fb44b3398aa609c511546007e813 100644
--- a/example/Vector/0_simple/Makefile
+++ b/example/Vector/0_simple/Makefile
@@ -15,7 +15,7 @@ vect: $(OBJ)
 all: vect
 
 run: all
-	source $$HOME/openfpm_vars; mpirun -np 2 ./vect
+	mpirun -np 2 ./vect
 
 .PHONY: clean all run
 
diff --git a/example/Vector/1_celllist/Makefile b/example/Vector/1_celllist/Makefile
index 6e6e5296445bb2a09a5c71ee0b6520c894689aba..c9a76a23b45b50e073b571f48fa3653a60cdbc13 100644
--- a/example/Vector/1_celllist/Makefile
+++ b/example/Vector/1_celllist/Makefile
@@ -15,7 +15,7 @@ cell: $(OBJ)
 all: cell
 
 run: all
-	source $$HOME/openfpm_vars; mpirun -np 2 ./cell
+	mpirun -np 2 ./cell
 
 .PHONY: clean all run
 
diff --git a/example/Vector/1_ghost_get_put/Makefile b/example/Vector/1_ghost_get_put/Makefile
index ec17c36a18177ac26a37b539eab7037dc4b2e33e..57bab07e06ec25f5e2ef2af05f63a2ef90b89be9 100644
--- a/example/Vector/1_ghost_get_put/Makefile
+++ b/example/Vector/1_ghost_get_put/Makefile
@@ -15,7 +15,7 @@ ghost: $(OBJ)
 all: ghost
 
 run: all
-	source $$HOME/openfpm_vars; mpirun -np 2 ./ghost
+	mpirun -np 2 ./ghost
 
 .PHONY: clean all run
 
diff --git a/example/Vector/2_expressions/Makefile b/example/Vector/2_expressions/Makefile
index a7705b979c6bc1afbfb7d920e5f21da8684f4cea..7ab3093eedd5282dcf9269bd222005e21e2bf357 100644
--- a/example/Vector/2_expressions/Makefile
+++ b/example/Vector/2_expressions/Makefile
@@ -15,7 +15,7 @@ expr: $(OBJ)
 all: expr
 
 run: all
-	source $$HOME/openfpm_vars; mpirun -np 3 ./expr
+	mpirun -np 3 ./expr
 
 .PHONY: clean all run
 
diff --git a/example/Vector/3_molecular_dynamic/Makefile b/example/Vector/3_molecular_dynamic/Makefile
index 577249edf624c0aa2f13ba535e9d2fc809ca2209..98e3f7a4b4b8cefca7cdcd5c0937198887ed81a7 100644
--- a/example/Vector/3_molecular_dynamic/Makefile
+++ b/example/Vector/3_molecular_dynamic/Makefile
@@ -23,7 +23,7 @@ md_dyn_vl: $(OBJ_VL)
 	$(CC) -o $@ $^ $(CFLAGS) $(LIBS_PATH) $(LIBS)
 
 run: all
-	source $$HOME/openfpm_vars; mpirun -np 3 ./md_dyn; mpirun -np 3 ./md_dyn_expr; mpirun -np 3 ./md_dyn_vl;
+	mpirun -np 3 ./md_dyn && mpirun -np 3 ./md_dyn_expr && mpirun -np 3 ./md_dyn_vl;
 
 .PHONY: clean all run
 
diff --git a/example/Vector/4_complex_prop/Makefile b/example/Vector/4_complex_prop/Makefile
index 0c96d0bd10d9f09b0a65333bb91e942c10aed1fb..2de12f95f6b02c804e5fa5a0b835d5c78fa9337d 100644
--- a/example/Vector/4_complex_prop/Makefile
+++ b/example/Vector/4_complex_prop/Makefile
@@ -19,7 +19,7 @@ vect_ser: $(OBJ_SER)
 	$(CC) -o $@ $^ $(CFLAGS) $(LIBS_PATH) $(LIBS)
 
 run: all
-	source $$HOME/openfpm_vars && mpirun -np 2 ./vect_cp && mpirun -np 2 ./vect_ser
+	mpirun -np 2 ./vect_cp && mpirun -np 2 ./vect_ser
 
 .PHONY: clean all run
 
diff --git a/example/Vector/4_multiphase_celllist_verlet/Makefile b/example/Vector/4_multiphase_celllist_verlet/Makefile
index 5e1e4a6a19709e8f0d34ebd41439b99cfad22252..e14eedbb41b3cc4cd79451b34eebcc209de98f2a 100644
--- a/example/Vector/4_multiphase_celllist_verlet/Makefile
+++ b/example/Vector/4_multiphase_celllist_verlet/Makefile
@@ -15,7 +15,7 @@ multip: $(OBJ)
 all: multip
 
 run: all
-	source $$HOME/openfpm_vars; mpirun -np 2 ./multip
+	mpirun -np 2 ./multip
 
 .PHONY: clean all run
 
diff --git a/example/Vector/4_reorder/Makefile b/example/Vector/4_reorder/Makefile
index c5ada0a42e2a3fbefe910f8839e774e748913a69..2569b0b64d49609a916adb2b92b36a3d9c566461 100644
--- a/example/Vector/4_reorder/Makefile
+++ b/example/Vector/4_reorder/Makefile
@@ -28,7 +28,7 @@ md_comp_ord_test: $(OBJ_CORD)
 	$(CC) -o $@ $^ $(CFLAGS) $(LIBS_PATH) $(LIBS)
 
 run: all_test
-	source $$HOME/openfpm_vars; mpirun -np 4 ./md_data_ord_test; mpirun -np 4 ./md_comp_ord_test
+	mpirun -np 4 ./md_data_ord_test && mpirun -np 4 ./md_comp_ord_test
 
 .PHONY: clean all run all_test on_test
 
diff --git a/example/Vector/5_molecular_dynamic_sym/Makefile b/example/Vector/5_molecular_dynamic_sym/Makefile
index 56f83af9175e1959fab71c45b6cf2836c7a97b23..cf0391fab74d27ace055d5904d8df2c180b2266d 100644
--- a/example/Vector/5_molecular_dynamic_sym/Makefile
+++ b/example/Vector/5_molecular_dynamic_sym/Makefile
@@ -15,7 +15,7 @@ md_sym: $(OBJ_DORD)
 	$(CC) -o $@ $^ $(CFLAGS) $(LIBS_PATH) $(LIBS)
 
 run: md_sym
-	source $$HOME/openfpm_vars; mpirun -np 3 ./md_sym
+	mpirun -np 3 ./md_sym
 
 .PHONY: clean all run
 
diff --git a/example/Vector/6_complex_usage/Makefile b/example/Vector/6_complex_usage/Makefile
index cbd0c9e992d31808b4fee0b044fd20c3ea7d9262..31385b0c5b98849b22cab8969db58365498defc6 100644
--- a/example/Vector/6_complex_usage/Makefile
+++ b/example/Vector/6_complex_usage/Makefile
@@ -15,7 +15,7 @@ complex_use: $(OBJ_DORD)
 	$(CC) -o $@ $^ $(CFLAGS) $(LIBS_PATH) $(LIBS)
 
 run: all
-	source $$HOME/openfpm_vars; mpirun -np 3 ./complex_use
+	mpirun -np 3 ./complex_use
 
 .PHONY: clean all run all_test on_test