more arrangement for clarity
update vendor lib