Big update of Chapter 9