incorporate PR comments