SRP refactoring
checkpoint
Next checkpoint