Updated up to chapter 18