Latest changes merged into graph.php