Process Nicolas' comments (Part2)