Change the System 25881

Stability for the Next Generation 24630