New: upgradetosavestates