chap 2 edited