Updated for deployed server