incorporating feedback to PR 381