Updated calculation on partition count