refactor-checkpoint2