Revert "Working version"

This reverts commit 2df72d4f833bce1b163b680425ea43e654a6ef5a.