Revert "Working version"

This reverts commit 1483271c5d2d09fdb531cad5e3a6768af9a2534c.