diff --git a/ReportingServices.Shared/HelperClasses/DailyReportHelper.cs b/ReportingServices.Shared/HelperClasses/DailyReportHelper.cs
index 7969f73..d60474b 100644
--- a/ReportingServices.Shared/HelperClasses/DailyReportHelper.cs
+++ b/ReportingServices.Shared/HelperClasses/DailyReportHelper.cs
@@ -24,37 +24,7 @@ public static class DailyReportHelper
             else
                 report.SLLTools = tools;
 
-            if (currentDateTime.Date > manualEntries.Date)
-            {
-                string weeklyPtChng;
-
-                if (currentDateTime.DayOfWeek == DayOfWeek.Monday)
-                    weeklyPtChng = null;
-                else
-                    weeklyPtChng = manualEntries.WeeklyPartChanges;
-
-                report.ManualReportEntries = new ManualReportEntries()
-                {
-                    Date = currentDateTime.Date,
-                    OperatorHeadcountDays = 0,
-                    OperatorHeadcountNights = 0,
-                    OperatorCallOutsDays = 0,
-                    OperatorCallOutsNights = 0,
-                    MaintenanceHeadcountDays = 0,
-                    MaintenanceHeadcountNights = 0,
-                    MaintenanceCallOutsDays = 0,
-                    MaintenanceCallOutsNights = 0,
-                    EngineeringHeadcountDays = 0,
-                    EngineeringHeadcountNights = 0,
-                    EngineeringCallOutsDays = 0,
-                    EngineeringCallOutsNights = 0,
-                    BottleChanges = null,
-                    DailyPartChanges = null,
-                    WeeklyPartChanges = weeklyPtChng
-                };
-            }
-            else
-                report.ManualReportEntries = manualEntries;
+            report.ManualReportEntries = manualEntries;
 
         }
         catch (Exception ex)
@@ -148,7 +118,6 @@ public static class DailyReportHelper
         {
             report.QuarterlyTargets = targets.Result;
             report.SetRDSInfo(rds.Result);
-            report.SetReactorInfo(reactors, GetUnscheduledReactors(report));
 
             foreach (Task<List<ReactorEvent>> task in toolEvents)
             {
@@ -161,6 +130,8 @@ public static class DailyReportHelper
                 report.ToolEvents.Add(toolEvent);
             }
 
+            report.SetReactorInfo(reactors, GetUnscheduledReactors(report));
+
             report.ToolEvents = report.ToolEvents
                 .Where(x => x.Reactor is not "47")
                 .OrderBy(x => x.Reactor)
@@ -212,7 +183,7 @@ public static class DailyReportHelper
 
         foreach (ToolEventView tool in report.ToolEvents)
         {
-            if (!tool.IsInProduction)
+            if (tool.MostRecentEvent.REACT_MODE.ToUpper() == "IDLE")
             {
                 reactors.Add(int.Parse(tool.Reactor));
             }
diff --git a/ReportingServices.Shared/Models/ProductionReport/ManualReportEntries.cs b/ReportingServices.Shared/Models/ProductionReport/ManualReportEntries.cs
index 75094d2..a6eaa89 100644
--- a/ReportingServices.Shared/Models/ProductionReport/ManualReportEntries.cs
+++ b/ReportingServices.Shared/Models/ProductionReport/ManualReportEntries.cs
@@ -2,7 +2,6 @@
 
 public class ManualReportEntries
 {
-    public DateTime Date { get; set; }
     public int OperatorHeadcountDays { get; set; }
     public int OperatorHeadcountNights { get; set; }
     public int OperatorCallOutsDays { get; set; }
diff --git a/ReportingServices.Shared/ViewModels/ProductionReport/ToolEventView.cs b/ReportingServices.Shared/ViewModels/ProductionReport/ToolEventView.cs
index a8ac6df..17f0034 100644
--- a/ReportingServices.Shared/ViewModels/ProductionReport/ToolEventView.cs
+++ b/ReportingServices.Shared/ViewModels/ProductionReport/ToolEventView.cs
@@ -165,6 +165,12 @@ public class ToolEventView
         if (evnt.ToUpper() == "UP_WITH_INCREASED_SAMPLING")
             return true;
 
+        if (evnt.ToUpper() == "IDLE")
+            return true;
+
+        if (evnt.ToUpper() == "ENGINEERING_DEVELOPMENT")
+            return true;
+
         return false;
     }
 
diff --git a/ReportingServices.UI/Controllers/ProductionReportController.cs b/ReportingServices.UI/Controllers/ProductionReportController.cs
index d4046b2..e11ec9c 100644
--- a/ReportingServices.UI/Controllers/ProductionReportController.cs
+++ b/ReportingServices.UI/Controllers/ProductionReportController.cs
@@ -50,8 +50,6 @@ public class ProductionReportController : Controller
     [HttpPost]
     public IActionResult EditDailyReport(ManualReportEntries rpt)
     {
-        rpt.Date = DateTime.Now.Date;
-
         JsonFileHandler.SaveJSONFile(rpt, _dailyRptFilePath);
 
         return RedirectToAction("DailyReport");
diff --git a/ReportingServices.UI/Views/ProductionReport/DailyReport.cshtml b/ReportingServices.UI/Views/ProductionReport/DailyReport.cshtml
index 3ba6165..aef273a 100644
--- a/ReportingServices.UI/Views/ProductionReport/DailyReport.cshtml
+++ b/ReportingServices.UI/Views/ProductionReport/DailyReport.cshtml
@@ -236,7 +236,19 @@
     </div>
 </div>
 <ul>
-    <li>Application ENG (0):</li>
+    @{
+        List<string> engTools = Model.ToolEvents
+        .Where(x => x.MostRecentEvent.REACT_MODE == "ENGINEERING_DEVELOPMENT")
+        .Select(x => x.Reactor).ToList();
+    }
+    <li>Application ENG (@engTools.Count()):
+        @if (engTools.Count() > 0)
+        {
+            <ul>
+                <li>@string.Join(',', engTools)</li>
+            </ul>
+        }
+    </li>
     <li>Reactors (Capacity @(Model.NumberOfToolsWaferSize6IN + Model.NumberOfToolsWaferSize8IN))
         <ul>
             <li>150mm - @Model.NumberOfToolsWaferSize6IN</li>
diff --git a/ReportingServices.UI/Views/Shared/_DailyReportPartial.cshtml b/ReportingServices.UI/Views/Shared/_DailyReportPartial.cshtml
index d7619d7..35a5f39 100644
--- a/ReportingServices.UI/Views/Shared/_DailyReportPartial.cshtml
+++ b/ReportingServices.UI/Views/Shared/_DailyReportPartial.cshtml
@@ -41,7 +41,7 @@
     </thead>
     <tbody>
         <tr>
-            <td scope="row">Commited Target to meet Shipment Requirements</td>
+            <td scope="row">Committed Target to meet Shipment Requirements</td>
             <td class="text-center">@string.Format("{0:#,###}", Model.DailyPlanWafers)</td>
             <td class="text-center">@string.Format("{0:#,###}", Model.DailyPlanWafers)</td>
             <td class="text-center">@string.Format("{0:#,###}", Model.DailyPlanWafers)</td>
diff --git a/ReportingServices.UI/wwwroot/Assets/DailyReportInfo.json b/ReportingServices.UI/wwwroot/Assets/DailyReportInfo.json
index 0e8aa37..7396847 100644
--- a/ReportingServices.UI/wwwroot/Assets/DailyReportInfo.json
+++ b/ReportingServices.UI/wwwroot/Assets/DailyReportInfo.json
@@ -1 +1 @@
-{"Date":"2023-01-15T00:00:00-07:00","OperatorHeadcountDays":14,"OperatorHeadcountNights":12,"OperatorCallOutsDays":0,"OperatorCallOutsNights":1,"EngineeringHeadcountDays":1,"EngineeringHeadcountNights":1,"EngineeringCallOutsDays":0,"EngineeringCallOutsNights":0,"MaintenanceHeadcountDays":3,"MaintenanceHeadcountNights":3,"MaintenanceCallOutsDays":0,"MaintenanceCallOutsNights":0,"BottleChanges":"R22","DailyPartChanges":"R23,R25","WeeklyPartChanges":"R23,R25,R27,R29,R36,R37"}
\ No newline at end of file
+{"OperatorHeadcountDays":0,"OperatorHeadcountNights":0,"OperatorCallOutsDays":0,"OperatorCallOutsNights":0,"EngineeringHeadcountDays":0,"EngineeringHeadcountNights":0,"EngineeringCallOutsDays":0,"EngineeringCallOutsNights":0,"MaintenanceHeadcountDays":0,"MaintenanceHeadcountNights":0,"MaintenanceCallOutsDays":0,"MaintenanceCallOutsNights":0,"BottleChanges":null,"DailyPartChanges":null,"WeeklyPartChanges":"R23,R25,R27,R29,R36,R37"}
\ No newline at end of file
diff --git a/ReportingServices.UI/wwwroot/Assets/SLLTools.json b/ReportingServices.UI/wwwroot/Assets/SLLTools.json
index dc07525..76f28fb 100644
--- a/ReportingServices.UI/wwwroot/Assets/SLLTools.json
+++ b/ReportingServices.UI/wwwroot/Assets/SLLTools.json
@@ -1,37 +1 @@
-[
-  {
-    "Date": "2023-01-09T00:00:00-07:00",
-    "ASM": 8,
-    "HTR": 16
-  },
-  {
-    "Date": "2023-01-10T00:00:00-07:00",
-    "ASM": 8,
-    "HTR": 16
-  },
-  {
-    "Date": "2023-01-11T00:00:00-07:00",
-    "ASM": 8,
-    "HTR": 16
-  },
-  {
-    "Date": "2023-01-12T00:00:00-07:00",
-    "ASM": 7,
-    "HTR": 16
-  },
-  {
-    "Date": "2023-01-13T00:00:00-07:00",
-    "ASM": 7,
-    "HTR": 15
-  },
-  {
-    "Date": "2023-01-14T00:00:00-07:00",
-    "ASM": 8,
-    "HTR": 15
-  },
-  {
-    "Date": "2023-01-15T00:00:00-07:00",
-    "ASM": 9,
-    "HTR": 15
-  }
-]
\ No newline at end of file
+[{"Date":"2023-01-09T00:00:00-07:00","ASM":8,"HTR":16},{"Date":"2023-01-10T00:00:00-07:00","ASM":8,"HTR":16},{"Date":"2023-01-11T00:00:00-07:00","ASM":8,"HTR":16},{"Date":"2023-01-12T00:00:00-07:00","ASM":7,"HTR":16},{"Date":"2023-01-13T00:00:00-07:00","ASM":7,"HTR":15},{"Date":"2023-01-14T00:00:00-07:00","ASM":8,"HTR":15},{"Date":"2023-01-15T00:00:00-07:00","ASM":9,"HTR":15},{"Date":"2023-01-17T00:00:00-07:00","ASM":9,"HTR":15}]
\ No newline at end of file