.
tweaks to support existing checkpoints