changes after Walter's pull request review