trade was added new field, some bug fixed and refactoring