added and changed sub-cohorts to match reporting recommendations