Added polish to Trade Component