Updates from chapter 6.