Responses #2 to PR comments