support candidate groups
Merging changes