Chapter 9 updates to highlighting mode