Completed chapter 6 and 7