Add checkpoints and change alert key