@ogrisel let's keep this for a second PR. Wdyt?