adressed @pgiraud's comments