Checkpoint; working better