Checkpoint, about to make some updates