completed chap 2, updated chap 1