Updated versions of Chp 2 and 3