More graph work