Simpler upgrade, still safe