Made the group check smarter -- Not sure it's even working