@jeremy updated to use a refactored method