Updated few chapters