Update to latest changes from client