added ability to obtain client