server code updated