Improvements on parallelization