Diversity and Super-Diversity