Checkpoint, about to simplify