revision of chapters 1 and 2