adding proper client setup