Changed Server back to original functionality