Changes for ch5 and start of ch6.