B-51783 updating based on seths pull request feedback