Trying to make this better for a pull request.