New MarketData, with Saishav's updates