Updated client code