Modify little bit CHAP1 and CHAP6