Checkpoint; finally working right!