new changes for vendor
fixed conflicting changes