Finish Chapter 6

Change-Id: I7f4fb63b3e3be50bd8ad431e5ffe213123318b9e