Updated Partitioning
Fixed Conflicts