More changes after pull request