- refactoring
- checkpoint logic progess