diff --git a/artifact/src/matlab/ctl_eval.m b/artifact/src/matlab/ctl_eval.m
index d7faa8d1a6be4aabae086ac6e3e4ba68627d9709..febd067e4a68cc8d2930f2019f252bbbf11edc49 100644
--- a/artifact/src/matlab/ctl_eval.m
+++ b/artifact/src/matlab/ctl_eval.m
@@ -1,4 +1,4 @@
-global folder_name;
+function [] = ctl_eval(folder_name)
 
 % add jitterbug and jittertime packages -----------------------------------
 addpath(genpath('./jitterbug-1.23'));
@@ -247,4 +247,6 @@ csvwrite(strcat(folder_name, 'JRob_maxmin_s2.csv'),[h_list; JRob_list(3,:); JRob
 csvwrite(strcat(folder_name, 'Jclass_s0.csv'),[h_list; JRob_list(1,:); JClass_list(1,:)]');
 csvwrite(strcat(folder_name, 'Jclass_s1.csv'),[h_list; JRob_list(2,:); JClass_list(2,:)]');
 csvwrite(strcat(folder_name, 'Jclass_s2.csv'),[h_list; JRob_list(3,:); JClass_list(3,:)]');
-csvwrite(strcat(folder_name, 'JCv_list.csv'),[h_list; JCv_list]');
\ No newline at end of file
+csvwrite(strcat(folder_name, 'JCv_list.csv'),[h_list; JCv_list]');
+
+end
diff --git a/artifact/src/matlab/ctl_eval_fo.m b/artifact/src/matlab/ctl_eval_fo.m
index 03fddc0d2038c8760c9f18f4f8e1c34d1395d2e1..cc842fb433f2910cda1ff9fd47174dc2e358d09a 100644
--- a/artifact/src/matlab/ctl_eval_fo.m
+++ b/artifact/src/matlab/ctl_eval_fo.m
@@ -1,4 +1,4 @@
-global folder_name;
+function [] = ctl_eval_fo(folder_name)
 
 % add jitterbug and jittertime packages -----------------------------------
 addpath(genpath('./jitterbug-1.23'));
@@ -247,4 +247,6 @@ csvwrite(strcat(folder_name, 'JRob_maxmin_s2_fo.csv'),[h_list; JRob_list(3,:); J
 csvwrite(strcat(folder_name, 'Jclass_s0_fo.csv'),[h_list; JRob_list(1,:); JClass_list(1,:)]');
 csvwrite(strcat(folder_name, 'Jclass_s1_fo.csv'),[h_list; JRob_list(2,:); JClass_list(2,:)]');
 csvwrite(strcat(folder_name, 'Jclass_s2_fo.csv'),[h_list; JRob_list(3,:); JClass_list(3,:)]');
-csvwrite(strcat(folder_name, 'JCv_list_fo.csv'),[h_list; JCv_list]');
\ No newline at end of file
+csvwrite(strcat(folder_name, 'JCv_list_fo.csv'),[h_list; JCv_list]');
+
+end
diff --git a/artifact/src/matlab/run_all_tests_matlab.m b/artifact/src/matlab/run_all_tests_matlab.m
index 0a92804a2a9e575b2ee5203f090ac6ce027b7908..3930d9b40db1d044d1efdd41c060860378337e77 100644
--- a/artifact/src/matlab/run_all_tests_matlab.m
+++ b/artifact/src/matlab/run_all_tests_matlab.m
@@ -2,15 +2,13 @@
 
 function run_all_tests_matlab(name_folder)
 
-    global folder_name;
-
     all_folders = dir(strcat(name_folder,'/n*'));
-    for i=1:size(all_folders,1)
+    parfor i=1:size(all_folders,1)
         name_subf =  all_folders(i).name;
         folder_name = strcat(name_folder, '/', name_subf, '/');
-        run ctl_eval;
-        run ctl_eval_fo;
+        ctl_eval(folder_name);
+        ctl_eval_fo(folder_name);
         fprintf(2, 'Matlab wrote results for %s\n', name_subf)
     end
     fprintf(2, '------------------------------------------------\n' );
-end
\ No newline at end of file
+end