diff --git a/redaction-report-service-v1/redaction-report-service-server-v1/src/main/java/com/iqser/red/service/redaction/report/v1/server/service/WordReportGenerationService.java b/redaction-report-service-v1/redaction-report-service-server-v1/src/main/java/com/iqser/red/service/redaction/report/v1/server/service/WordReportGenerationService.java
index 4b451f6..b063c2a 100644
--- a/redaction-report-service-v1/redaction-report-service-server-v1/src/main/java/com/iqser/red/service/redaction/report/v1/server/service/WordReportGenerationService.java
+++ b/redaction-report-service-v1/redaction-report-service-server-v1/src/main/java/com/iqser/red/service/redaction/report/v1/server/service/WordReportGenerationService.java
@@ -121,15 +121,36 @@ public class WordReportGenerationService {
         XWPFTable table = getTableWithPlaceholder(doc);
 
         for (XWPFTableRow row : table.getRows()) {
-            XWPFTableRow newRow = table.createRow();
-            for (int i=0; i<row.getTableCells().size(); i++) {
-                if(row.getTableCells().get(i).getText().contains(FILENAME_PLACEHOLDER)) {
-                    setText(row.getCell(i), filename);
+//            if (row.getCell())
+
+            reportEntries.forEach(entry -> {
+                for (int i = 0; i < row.getTableCells().size(); i++) {
+                    System.out.println(row.getCell(i).getText());
+                    String cellText = row.getCell(i).getText();
+                    if(containsPlaceholder(cellText)) {
+                        final int j = i;
+                            XWPFTableRow newRow = table.createRow();
+                            if (row.getCell(j).getText().contains(FILENAME_PLACEHOLDER)) {
+                                setText(newRow.getCell(j), filename);
+                                break;
+                            }
+                            if (row.getCell(j).getText().contains(PAGE_PLACEHOLDER)) {
+                                setText(newRow.getCell(j), String.valueOf(entry.getPage()));
+                                break;
+                            }
+                            if (row.getCell(j).getText().contains(PARAGRAPH_PLACEHOLDER)) {
+                                setText(newRow.getCell(j), entry.getSection());
+                                break;
+                            }
+                            if (row.getCell(j).getText().contains(REASON_PLACEHOLDER)) {
+                                setText(newRow.getCell(j), entry.getJustification());
+                                break;
+                            }
+                            System.out.println(row.getCell(j).getText());
+
+                    }
                 }
-                if(row.getTableCells().get(i).getText().contains(PAGE_PLACEHOLDER)) {
-                    setText(row.getCell(i), String.valueOf(reportEntries.getPage()));
-                }
-            }
+            });
         }
 
 
@@ -140,15 +161,17 @@ public class WordReportGenerationService {
             setText(row.getCell(1), String.valueOf(entry.getPage()));
             setText(row.getCell(2), entry.getSection());
             setText(row.getCell(3), entry.getJustification());
+            System.out.println(row);
         });
     }
 
     private int getCell(XWPFTableRow row,String placeholder) {
         for (int i=0; i<row.getTableCells().size(); i++) {
             if(row.getTableCells().get(i).getText().contains(placeholder)) {
-                cell.
+//                cell.
             }
         }
+        return 0;
     }