Updated Ch3 with Trent and Curt's changes