Group check

Group check now works correctly.