Chapter 3 improvements.