update according to PR comments