Update from chapter 01 to chapter 03