Structured pull request for my changes.