Initial rework of graphs