updated chapter 1-3