Reworked till the chapter 4