Updated to chapter 5