Make Trade function better