fix bug
Merge branch 'groups2' into testing