added the rework sent by johi given by DA_v02
chapter 6 seems corrected