ENH take @glouppe comments into account