Revert "architecture didn't work, trying something different"

The problem is somewhere else :/
This reverts commit b9cf304afa79d0fd14460450cbe31065f26d15d4.