Revert "New spproach"

This is combusticated too... :(

This reverts commit 60ba6b085bc25d77f3758bc111865a681e2a134a.