Checkpoint: almost working