Editing: Client.php