End of Chapter 17 commit