updated for chapters 6 and 7