Added chapters 07 and 08