Updated client 2