Client code updated