refactored out the client pointer