Modification on chapters 4 and 6