Checkpoint. More refactoring.