Alter implementation.
Merge pull request #1 from adam-vessey/7.x

Alter implementation.