Implemented checkpoints