Checkpoint.
More changes.