Changed from simpleclient to client