reverted version ready for feature pull request