Edited grouping so that DD and NT groups can be separated