add most of ch2