Update after adrien review