added client, changed buildGraph