reorg chap 3 from krste commments