Changes from comments in PR #8