Modified server code