Chapter 9 applied

Change-Id: I63d3d91f9e6529a438291e2c0e20049d21c9ec9d