Get rid of SS - a counter and one per PCS as a minimum.
Keep the GS trigger.
Spread 23M7 among the whole BES.
Move OOBWS below IBGS.

The old PB rules should come back into full force BEFORE we think about negotiating anything. And it needs to be contract language. Renegotiating something we already had? No thanks.