addressing more comments from Grigore