added chapter 6 and 7 for OO1