Updated for group awareness