Now identifying groups, fixed bug