Revert "Big changes"

This reverts commit 2ba828be53b7c7ec17a01d1d94a22f674a64dd1e.