changes as in previous pull request.