Completed and integrated chapter 2