Addressing Changes in the PR