paper: Apply comments from Eugenia.