Added some missing pieces from chapter 1