Modification for other vendors 3