deleted extra toolbox + changed names + rearranged code in run_oo