End of Chapter 18 commit