finish chapter 12 - still bug