Incorporated Grigore's comments.