removed references to id (replaced with _id)