Finished fixing chapter 4