Updated chp. 1