major changes to chapters 1-3