Huge update to Vendor