trying to get rid of the vendor stuff