Comment work : update, deal better with line break, ...