Revert "working"

This reverts commit 5031229fba38ec7c8357e3ac26d8c7338b9755a4.
Fixed merging conflicts