Added some more changes for pull request.