#10 finetune wording and add group count