Lex's changes to the Trade stuff