Modified Client.cs