diff --git a/iTrust/WebRoot/auth/hcp-uap/viewPreRegisteredPatientList.jsp b/iTrust/WebRoot/auth/hcp-uap/viewPreRegisteredPatientList.jsp
index cc18d235ce42083da705c6493153956946c28578..49b3d1b796a0a8f807f228f210364e235fa8c5eb 100644
--- a/iTrust/WebRoot/auth/hcp-uap/viewPreRegisteredPatientList.jsp
+++ b/iTrust/WebRoot/auth/hcp-uap/viewPreRegisteredPatientList.jsp
@@ -1,51 +1,109 @@
 <%@taglib uri="/WEB-INF/tags.tld" prefix="itrust"%>
 <%@page errorPage="/auth/exceptionHandler.jsp"%>
 
+<%@page import="java.util.ArrayList"%>
 <%@page import="java.util.List"%>
+<%@page import="edu.ncsu.csc.itrust.beans.PatientBean"%>
+<%@page import="edu.ncsu.csc.itrust.beans.PatientVisitBean"%>
+
+<%@page import="edu.ncsu.csc.itrust.action.ViewPreRegisteredPatientListAction"%>
 
 <%@include file="/global.jsp" %>
 
 <%
-pageTitle = "iTrust - View Preregistered Patients";
+pageTitle = "iTrust - View All Pre-Registered Patients";
 %>
 
 <%@include file="/header.jsp" %>
 
-<br />
-
 <%
-    // Have to get the DAO
+ViewPreRegisteredPatientListAction action = new ViewPreRegisteredPatientListAction(prodDAO, loggedInMID.longValue());
+                            ///////////////////////              ViewPatientOfficeVisitHistoryAction(prodDAO, loggedInMID.longValue());
+
+//List<PatientBean> PreRegisteredPatientList = action.getPatients();   ////////   action   is    in     ViewPreRegisteredPatientListAction
+                             ////////////////       ????????????????  change   <PatientVisitBean> patientVisits  to   PreRegisteredPatientList
+List<PatientBean> PreRegisteredPatientList = action.getPreRegisteredPatients();
+                            		 
+loggingAction.logEvent(TransactionType.PATIENT_LIST_VIEW, loggedInMID, 0, "");  //////////   ?????????     TransactionType.PATIENT_LIST_VIEW
+
 %>
+			<script src="/iTrust/DataTables/media/js/jquery.dataTables.min.js" type="text/javascript"></script>
+			<script type="text/javascript">
+				jQuery.fn.dataTableExt.oSort['lname-asc']  = function(x,y) {
+					var a = x.split(" ");
+					var b = y.split(" ");
+					return ((a[1] < b[1]) ? -1 : ((a[1] > b[1]) ?  1 : 0));
+				};
+				
+				jQuery.fn.dataTableExt.oSort['lname-desc']  = function(x,y) {
+					var a = x.split(" ");
+					var b = y.split(" ");
+					return ((a[1] < b[1]) ? 1 : ((a[1] > b[1]) ?  -1 : 0));
+				};
+			</script>
+			<script type="text/javascript">	
+   				$(document).ready(function() {
+       				$("#patientList").dataTable( {
+       					"aaColumns": [ [2,'dsc'] ],
+       					"aoColumns": [ { "sType": "lname" }, null, null],
+       					"bStateSave": true,
+       					"sPaginationType": "full_numbers"
+       				});
+   				});
+			</script>
+			<style type="text/css" title="currentStyle">
+				@import "/iTrust/DataTables/media/css/demo_table.css";		
+			</style>
 
-<div align=center>
-	<table id="patientList" class="fTable">
-	<thead>	
-		<tr>
-		<th colspan="4" style="text-align: center;">All Preregistered Patients</th>
-		</tr>	
-		<tr>
-			<th align="center" width="200"><div align="center">Patient Name</div></th>
-		</tr>
+<br />
+	<h2>Pre-Registered Patients</h2>
+<form action="viewReport.jsp" method="post" name="myform">
+<table class="display fTable" id="patientList" align="center">
+	
+	<thead>
+
+
+	<tr class="">
+		<th>Name</th>
+		<th>Address</th>
+		<th>Email</th>
+
+	</tr>
 	</thead>
 	<tbody>
-		<%
-		List<PreRegisteredBean> beans = patientDAO.getPreregisteredPatients();
-        for (PreregisteredBean b : beans) {
-            Patient p = b.getPatient();
-		%>
-		<tr>
-			<td align="center">
-                <a href="editPreregisteredPatient.jsp?pid=<%= StringEscapeUtils.escapeHtml(p.getMID().toString()) %>">
-                    <%= StringEscapeUtils.escapeHtml(patient.getFullName().toString()) %>
-                </a>
-            </td>
-		</tr>
-		<%
+	<%
+		List<PatientBean> patientsList = new ArrayList<PatientBean>();         ///////////////////////////////////
+		int index = 0;
+		
+		for (PatientBean bean : PreRegisteredPatientList) {      //////////   ????????????????????   Change   PatientVisitBean to   PatientBean
+			patientsList.add(bean);
+	%>
+	<tr>
+		<td >
+			<a href="editPHR.jsp?patient=<%= StringEscapeUtils.escapeHtml("" + (index)) %>">
+		
+		
+			<%= StringEscapeUtils.escapeHtml("" + (bean.getFullName())) %>	
+		
+		
+			</a>
+			</td>
+		<td ><%= StringEscapeUtils.escapeHtml("" + (bean.getStreetAddress1() +" " +bean.getStreetAddress2() +" " +bean.getStreetAddress3())) %></td>
+		<td >
+				<%= StringEscapeUtils.escapeHtml("" + (bean.getEmail())) %>
+		</td>
+	</tr>
+	<%
+			index ++;
+	
 		}
-		%>	
-		<th colspan="4"></th>		
+		
+		session.setAttribute("patients", patientsList);                 ////////////////////        ??????????????????????????????????????????
+	%>
 	</tbody>
 </table>
-</div>
+</form>
+<br />
+<br />
 
-<%@include file="/footer.jsp"%>
+<%@include file="/footer.jsp" %>