diff --git a/src/main/java/usecase/GetAverageGradeUseCase.java b/src/main/java/usecase/GetAverageGradeUseCase.java
index 25140b18..147fb35a 100644
--- a/src/main/java/usecase/GetAverageGradeUseCase.java
+++ b/src/main/java/usecase/GetAverageGradeUseCase.java
@@ -23,11 +23,13 @@ public float getAverageGrade(String course) {
         // Call the API to get usernames of all your team members
         float sum = 0;
         int count = 0;
-        // TODO Task 3b: Go to the MongoGradeDataBase class and implement getMyTeam.
         final Team team = gradeDataBase.getMyTeam();
         // Call the API to get all the grades for the course for all your team members
-        // TODO Task 3a: Complete the logic of calculating the average course grade for
-        //              your team members. Hint: the getGrades method might be useful.
+        for (String members: team.getMembers()) {
+            Grade grade = gradeDataBase.getGrade(members, course);
+            sum += grade.getGrade();
+            count++;
+        }
 
         if (count == 0) {
             return 0;