Project updated up to chapter 6