Diversity estimates re-implementation