Updated client and servers