Updated Ch 17; added Ch 18