Updated parallelization