Added checkpoints, DGW Fix!