change back to using Client method