diff --git a/edit_ticket_update_modal.php b/edit_ticket_update_modal.php
new file mode 100644
index 00000000..9cd7bfb6
--- /dev/null
+++ b/edit_ticket_update_modal.php
@@ -0,0 +1,27 @@
+<div class="modal" id="editTicketUpdateModal<?php echo $ticket_update_id; ?>" tabindex="-1">
+  <div class="modal-dialog modal-lg">
+    <div class="modal-content bg-dark">
+      <div class="modal-header">
+        <h5 class="modal-title"><i class="fa fa-fw fa-edit"></i> Editing Ticket Update</h5>
+        <button type="button" class="close text-white" data-dismiss="modal">
+          <span>&times;</span>
+        </button>
+      </div>
+      <form action="post.php" method="post" autocomplete="off">
+        <input type="hidden" name="ticket_update_id" value="<?php echo $ticket_update_id; ?>">
+        
+        <div class="modal-body bg-white">
+          
+          <div class="form-group">
+            <textarea class="form-control summernote" rows="8" name="ticket_update"><?php echo $ticket_update; ?></textarea>
+          </div>
+
+        </div>
+        <div class="modal-footer bg-white">
+          <button type="button" class="btn btn-secondary" data-dismiss="modal">Cancel</button>
+          <button type="submit" name="edit_ticket_update" class="btn btn-primary">Save</button>
+        </div>
+      </form>
+    </div>
+  </div>
+</div>
\ No newline at end of file
diff --git a/post.php b/post.php
index 2a38b4e7..8e4d6a4e 100644
--- a/post.php
+++ b/post.php
@@ -1069,8 +1069,11 @@ if(isset($_POST['add_ticket_update'])){
 
     mysqli_query($mysqli,"INSERT INTO ticket_updates SET ticket_update = '$ticket_update', ticket_update_created_at = NOW(), ticket_update_by = $session_user_id, ticket_id = $ticket_id, company_id = $session_company_id") or die(mysqli_error($mysqli));
 
+    //UPDATE Ticket Last Response Field 
+    mysqli_query($mysqli,"UPDATE tickets SET ticket_updated_at = NOW() WHERE ticket_id = $ticket_id AND company_id = $session_company_id") or die(mysqli_error($mysqli));
+
     //Logging
-    mysqli_query($mysqli,"INSERT INTO logs SET log_type = 'Ticket Update', log_action = 'Created', log_description = '$ticket_id', log_created_at = NOW(), company_id = $session_company_id, ticket_update_by = $session_user_id");
+    mysqli_query($mysqli,"INSERT INTO logs SET log_type = 'Ticket Update', log_action = 'Created', log_description = '$ticket_id', log_created_at = NOW(), company_id = $session_company_id, user_id = $session_user_id");
 
     $_SESSION['alert_message'] = "Posted an update";
     
@@ -1078,6 +1081,36 @@ if(isset($_POST['add_ticket_update'])){
     
 }
 
+if(isset($_POST['edit_ticket_update'])){
+
+    $ticket_update_id = intval($_POST['ticket_update_id']);
+    $ticket_update = trim(mysqli_real_escape_string($mysqli,$_POST['ticket_update']));
+
+    mysqli_query($mysqli,"UPDATE ticket_updates SET ticket_update = '$ticket_update', ticket_update_updated_at = NOW() WHERE ticket_update_id = $ticket_update_id AND company_id = $session_company_id") or die(mysqli_error($mysqli));
+
+    //Logging
+    mysqli_query($mysqli,"INSERT INTO logs SET log_type = 'Ticket Update', log_action = 'Modified', log_description = '$ticket_update_id', log_created_at = NOW(), company_id = $session_company_id, user_id = $session_user_id");
+
+    $_SESSION['alert_message'] = "Ticket update modified";
+    
+    header("Location: " . $_SERVER["HTTP_REFERER"]);
+    
+}
+
+if(isset($_GET['archive_ticket_update'])){
+    $ticket_update_id = intval($_GET['archive_ticket_update']);
+
+    mysqli_query($mysqli,"UPDATE ticket_updates SET ticket_update_archived_at = NOW() WHERE ticket_update_id = $ticket_update_id AND company_id = $session_company_id");
+
+    //Logging
+    mysqli_query($mysqli,"INSERT INTO logs SET log_type = 'Ticket Update', log_action = 'Archived', log_description = '$ticket_update_id', log_created_at = NOW(), company_id = $session_company_id, user_id = $session_user_id");
+
+    $_SESSION['alert_message'] = "Ticket update archived";
+    
+    header("Location: " . $_SERVER["HTTP_REFERER"]);
+  
+}
+
 if(isset($_GET['close_ticket'])){
 
     $ticket_id = intval($_GET['close_ticket']);
diff --git a/ticket.php b/ticket.php
index 35c02f81..68bf557e 100644
--- a/ticket.php
+++ b/ticket.php
@@ -128,7 +128,7 @@ if(isset($_GET['ticket_id'])){
     </form>
 
     <?php
-    $sql = mysqli_query($mysqli,"SELECT * FROM ticket_updates WHERE ticket_id = $ticket_id ORDER BY ticket_update_id DESC");
+    $sql = mysqli_query($mysqli,"SELECT * FROM ticket_updates WHERE ticket_id = $ticket_id AND ticket_update_archived_at IS NULL ORDER BY ticket_update_id DESC");
 
       while($row = mysqli_fetch_array($sql)){;
         $ticket_update_id = $row['ticket_update_id'];
@@ -145,11 +145,18 @@ if(isset($_GET['ticket_id'])){
       <div class="card-body">
         <p><?php echo $ticket_update; ?></p>
       </div>
-      <div class="card-footer"><i class="fa fa-fw fa-clock"></i> <?php echo $ticket_update_created_at; ?> <i class="fa fa-fw fa-user"></i> <?php echo $ticket_update_by_display; ?></div>
+      <div class="card-footer"><i class="fa fa-fw fa-clock"></i> <?php echo $ticket_update_created_at; ?> <i class="fa fa-fw fa-user"></i> <?php echo $ticket_update_by_display; ?> 
+        <a href="#" data-toggle="modal" data-target="#editTicketUpdateModal<?php echo $ticket_update_id; ?>"><i class="fas fa-fw fa-edit text-secondary"></i></a>
+        <a href="post.php?archive_ticket_update=<?php echo $ticket_update_id; ?>"><i class="fas fa-fw fa-trash text-danger"></i></a>
+      </div>
     </div>
 
     <?php
+    
+    include("edit_ticket_update_modal.php");
+    
     }
+    
     ?>
   
   </div>
@@ -158,7 +165,6 @@ if(isset($_GET['ticket_id'])){
 
     <div class="card mb-3">
       <div class="card-body">
-  
         <div>  
           <h4 class="text-secondary">Client</h4>
           <i class="fa fa-fw fa-user text-secondary ml-1 mr-2 mb-2"></i> <?php echo $client_name; ?>