Chapter 4 structural improvements (I hope).