Some changes of old vendor :)