Revert "working version"

This reverts commit 0647b03da4b80fe6c3359e3366e0d20dea703063.