More Changes WRT Partitioner