Update after review of pull request from adamv