minor change : return id, data