current working version
Revert "current working version"

This reverts commit dcc50056f05f6abac623c34b17646fba35cc23ee.