Changes mostly chapter 4