CHapter 6 commit