Chapter 5 final updates.