Revert "many changes ;)"

This reverts commit b38fbdb5b0e7d25cc9f577542203d412f28f5032.