Second try at a pull request?