Separation of Partitioning & Parallelization, Update to match paper versions.