Restored Client Code