Change in response to comments in PR