crazy changes in vendor. Yo-ho