Update 24jul, chapter 1/2