re-written chapter 3
re-written chapter 4.