Chapter 4 improvements.