Stability for the Next Generation 8997

Change the System 8935