replacing lStorage.clientId with client