Changes to the partitioner