Latest commits on chapter 6