Updated per Mike's comments on the PR