chapter 2 final commit