Updated client to suit