Updated chapters 5 and 6