CHAPTER 6 - Fixes for final draft