Chapter 3 improved