I added some changed after a pull request review.