ENH: @wstefan good idea!