New pull request with changes based on review comments