Added partitioning.