Updates related to Chapter 5 rewrites