Updating to reflect new partitioning routines