Updated client files #2