updated to work with the vendors, and will replace all if found