adapted to new ->update[Model] methods, which now return the updated models