Continuing work on Checkpoint system