Updating framework + adding checkpoints