Revert "further major changes"

This reverts commit 688081771ea7f6a55beb08727e56d7dbdd20e014.
changes