Little change of server client