refactored to use augment for cleaner api/defaults