Most of the comments of the pull request included