How would you revisit these changes?
I honestly believe the hook/tunnel changes need to rely on how far the gens are along rather than hooks themselves in order for something like this to remotely work.