Added diamond, working on Trader