Updates from chapter 5.