Chapter 8 final commit.