Well I have not at all disappointed, since this edition includes both the integral part of the annotated, explained and summarized. Coupled with your course, this book will give you a great knowledge of the room and you will succeed without fighting your essays / comments.
If you opt for this very educational book, I recommend you still get yourself a French translation (that of François-Victor Hugo, for example), for optimum understanding and good preparation to aggregate appropriate.
Happy reading (and rereading)!