Edit from Brian on PartID