Improving Server/Client