Updated server and client