WorkingClient now works better