Updates based on comments from the PR