updated chapter 5~6.5