Final changes before pull request.