Changes requested as per pull request