Changed server code for client to be loaded