AFM: corrections
merge