Revert "Working version"

This reverts commit f0d84c8066a5fcc0e2f1c96de20c3ffb41ef8648.