Chapter 2 updated