stopped using my wrapper, maybe we do nt need it in client after all