Fixing DW section
Fixing chapter 5 and chapter 6