PR #17 feedback