Checkpoint; improvements coming