Check in the refactored, generic augment