Addressed Alexandre comments