Vendor: Make finish better