Added checkpoints
Added back proper check block return vals