Refactor gating + tune forces