address comments from PR 11