Revert "working version"

This reverts commit a5ad586d914cb3354f4bb96d7bab680fa27844ca.