Changes for graph2