Refactored out to separate function call