made changes specified in PR