Updated server code to current state of production code