Update of rapport, chapter 2, 4 and 5