more verbose naming and correct diversity overhead from 17 to 20