Revert "Simplified"

This reverts commit 82827fc2ddba98300da1bbca00c85d1c48987e18.
I liked the setup