Updated to chapter 4