Update for Chapters 1 and 2