Still in progress, but improved parallelization