Changes on the ClientProxy and the GUI