Improve count-population
Improve count-population