Greatly simplified logic.
Checkpoint