Temporarily removed calculatePartition