checkpoint major rework