Ok, I updated the pull request. Does that look good?