Updated until chapter 7