Improving checkpoint