Refactored graph_values and graph_values_short