Added the rest of ch2