Yes. Trigger and Count should have stayed with Spare Squadron.

No. It's better the way it is.