addressed Michael's comments on pull request