chapter 2 and 3 finished