Add trade and fix populate