Chapter 2 improvements.