updated from pull request comments MJ-443