Updated up to chapter 17