Issue #149 – Diversity