Simplifying reversion and using proper pattern mechanism.