HTH: Updating chapters 2 and 4