FINAL final changes for pull request