IMO, either put the GTZ on its own subloop or GTZ + Feser