Adressed @romainneutron 's comments