Still trying to fix the parallelization