Made some more corrections for partitioning