Updates to Ch 4, 5 and 6