Diff Fix, Checkpoints
changes