Design updated by comments in original Pull Request