Starting to fix the new group field.