Little bit more workin on Client