Checkpoint, many changes to be made