--- a/displaySupplier.php
+++ b/displaySupplier.php
@@ -4,9 +4,9 @@
     
 include_header("Supplier");
   $supplierS = htmlentities(strip_tags($_REQUEST['supplier']));
-  echo '<img src="graphs/displayMethodCountGraph.php?supplier=' . stripslashes($supplierS) . '">';
-   echo '<img src="graphs/displayCnCGraph.php?supplier=' . stripslashes($supplierS) . '">';
-   echo '<img src="graphs/displayMethodValueGraph.php?supplier=' . stripslashes($supplierS) . '">';
+  MethodCountGraph($supplierS);
+   CnCGraph($supplierS);
+  MethodValueGraph($supplierS);
   /*lobbyist ties
   
   links to ABR/ASIC/Google News/ASX/Court records
@@ -62,6 +62,7 @@
      histograph of supplier size/value
     */
 include_header("Suppliers");
+suppliersGraph();
   $query = 'SELECT SUM("value") as val, MAX("supplierName") as supplierName, "supplierABN",(
  case when "supplierABN" != 0 THEN "supplierABN"::text ELSE "supplierName" END) as supplierID 
 FROM contractnotice