second commit to catch up through chapter 5