Changes from newclient