Modified chapter 2 and 4, added chapters 3,4,5 & 7