working on Client Store