Changed around the graph api a little.