Updates for ch06