Added more checkpoints