Change Client code