Revert "didnt go the way as planned"

This reverts commit 43e0c58b496e2ce5c60e9f37f6120ffc985c3007.