Added 2d partitioning