I suppose this is the core of the pull request. Looks good.