Revert "Revert "no spaghetti""

This reverts commit d6e63e2ccdb45e16cd466d900b06ef9f1823df65.