Revert "reworked to my stuff"

This reverts commit b92d96f431a4aea02266f385063efdc731ae570a.