Checkpoint for the refactor