changed to new group names