Refactored to use existing macro_graph file.