diff --git a/guide.php b/guide.php
index 95f01cf..341e675 100755
--- a/guide.php
+++ b/guide.php
@@ -57,7 +57,8 @@
 $data = $DB->get_records_sql("SELECT    ggf.id AS ggfid, crs.shortname AS course, asg.name AS assignment, gd.name AS guide,
                                         ggc.shortname, ggf.score, ggf.remark, ggf.criterionid, rubm.username AS grader,
                                         stu.id AS userid, stu.idnumber AS idnumber, stu.firstname, stu.lastname,
-                                        stu.username AS student, gin.timemodified AS modified
+                                        stu.username AS student, gin.timemodified AS modified, ag.grade AS grade, 
+                                        afc.commenttext AS feedback
                                 FROM {course} crs
                                 JOIN {course_modules} cm ON crs.id = cm.course
                                 JOIN {assign} asg ON asg.id = cm.instance
@@ -67,6 +68,7 @@
                                 JOIN {gradingform_guide_criteria} ggc ON (ggc.definitionid = gd.id)
                                 JOIN {grading_instances} gin ON gin.definitionid = gd.id
                                 JOIN {assign_grades} ag ON ag.id = gin.itemid
+                                JOIN {assignfeedback_comments} AS afc ON ag.id = afc.grade
                                 JOIN {user} stu ON stu.id = ag.userid
                                 JOIN {user} rubm ON rubm.id = gin.raterid
                                 JOIN {gradingform_guide_fillings} ggf ON (ggf.instanceid = gin.id)
diff --git a/locallib.php b/locallib.php
index f2ef164..3193623 100755
--- a/locallib.php
+++ b/locallib.php
@@ -97,6 +97,10 @@ function report_componentgrades_finish_colheaders($workbook, $sheet, $pos) {
     $sheet->set_column($pos, $pos++, 10); // Set column width to 10.
     $sheet->write_string(5, $pos, get_string('timegraded', 'report_componentgrades'), $format2);
     $sheet->set_column($pos, $pos, 17.5); // Set column width to 17.5.
+    $sheet->write_string(5, $pos, get_string('grade', 'report_componentgrades'), $format2);
+    $sheet->set_column($pos, $pos++, 10); // Set column width to 10
+    $sheet->write_string(5, $pos, get_string('feedback', 'report_componentgrades'), $format2);
+    $sheet->set_column($pos, $pos++, 17.5); // Set column width to 17.5
     $sheet->merge_cells(4, $pos - 1, 4, $pos);
 
     $sheet->set_row(4, 15, $format);
@@ -174,6 +178,10 @@ function report_componentgrades_add_data(MoodleExcelWorksheet $sheet, array $stu
                 $sheet->write_string($row, $col++, $line->grader);
                 $sheet->set_column($col, $col, 35);
                 $sheet->write_string($row, $col, userdate($line->modified));
+                $sheet->set_column($col, $col, 13);
+                $sheet->write_string($row, $col++, $line->grade);
+                $sheet->set_column($col, $col, 14);
+                $sheet->write_string($row, $col++, strip_tags($line->feedback));
             }
         }
     }