Added a few checkpoints (just in case)