mainly chapter 6, but there are changes in other chapters as well