switched to merged-in graph + util