I'm going to do a new pull request with these changes.