--- a/displayCalendar.php
+++ b/displayCalendar.php
@@ -6,15 +6,23 @@
 if ($_REQUEST['month']) {
     echo "<center><h1>".$_REQUEST['month']."</h1></center>";
 $monthParts = explode("-",$_REQUEST['month']);
-  $query = "SELECT CNID, description, value, agencyName, category, contractStart, supplierName
-    FROM `contractnotice`
-    WHERE childCN = 0 
-    AND YEAR(contractStart) = {$monthParts[1]}
-    AND MONTH(contractStart)  = {$monthParts[0]}
-    ORDER BY value DESC";
-  $result = mysql_query($query);
-echo '<img src="graphs/displayMethodCountGraph.php?month=' . stripslashes($supplier) . '">';
-   echo '<img src="graphs/displayCnCGraph.php?month=' . stripslashes($supplier) . '">';
+  $query = 'SELECT "CNID", "description", "value", "agencyName", "category", "contractStart", "supplierName"
+    FROM contractnotice
+    WHERE "childCN" = 0 
+    AND extract(year from "contractStart") = :year
+    AND extract(month from "contractStart")  = :month
+    ORDER BY value DESC';
+$query = $conn->prepare($query);
+$query->bindParam(":month",  $monthParts[0]);
+
+$query->bindParam(":year",  $monthParts[1]);
+  $query->execute();
+  if (!$query) {
+    databaseError($conn->errorInfo());
+  }
+
+MethodCountGraph($supplier);
+CnCGraph($supplier);
 
   echo "<table>  <thead>
     <tr>
@@ -26,7 +34,7 @@
       <th>Supplier</th>
     </tr>
   </thead>";
-  while ($row = mysql_fetch_array($result, MYSQL_BOTH)) {
+  foreach ($query->fetchAll() as $row) {
     setlocale(LC_MONETARY, 'en_US');
     $value = number_format(doubleval($row['value']) , 2);
     echo ("<tr>
@@ -52,10 +60,14 @@
 echo '<img src="graphs/displayContractPublishedGraph.php">';
 
 
-$query = "SELECT YEAR(contractStart), MONTH(contractStart),
-SUM(value) as val, count(1) as count FROM `contractnotice` WHERE childCN = 0 GROUP BY MONTH(contractStart), YEAR(contractStart) ORDER BY YEAR(contractStart), MONTH(contractStart) ";
+$query = 'SELECT extract(year from "contractStart"), extract(month from "contractStart"),
+SUM(value) as val, count(1) as count FROM contractnotice WHERE "childCN" = 0 GROUP BY extract(year from "contractStart"), extract(month from "contractStart") ORDER BY extract(year from "contractStart"), extract(month from "contractStart") ';
+$query = $conn->prepare($query);
+  $query->execute();
+  if (!$query) {
+    databaseError($conn->errorInfo());
+  }
 
-$result = mysql_query($query);
   echo "<table>  <thead>
     <tr>
       <th>Month/Year</th>
@@ -63,7 +75,7 @@
       <th>Number of Contracts</th>
     </tr>
   </thead>";
-while ($row = mysql_fetch_array($result, MYSQL_BOTH)) {
+  foreach ($query->fetchAll() as $row) {
 setlocale(LC_MONETARY, 'en_US');
 $value = number_format(doubleval($row["val"]),2);
 $month_name = date( 'F', mktime(0, 0, 0, $row[1]) );