changes related to PR comments