adressed @romainneutron's comments