Revert "remade some things"

This reverts commit 33cb8dca27e88d306723bf97ea01b5b1a2e09b2a.