apply comments from PR 2 and 3