Addressed Adrien comments