Added checkpoint part II