Changed server code