final changes before pull request