might as well move this up into the `if` statement as you've done before, since there's no caching.