diff --git a/progress/tasks.py b/progress/tasks.py
index 7fb0de8..dfc2eeb 100644
--- a/progress/tasks.py
+++ b/progress/tasks.py
@@ -1,17 +1,20 @@
 from courses.api import CourseProgressApi
+from progress.models import ProgressLesson
 
 
 def add_next_lesson(progress):
-    sorted_token_list = CourseProgressApi.get_topic_lesson(progress.course_token)
-    is_next = False
-    new_lesson = None
+    lesson, is_hw = CourseProgressApi.get_next(
+        progress.course_token,
+        [i.lesson_token for i in progress.progresslesson_set.all()]
+    )
 
-    for lesson_list in sorted_token_list:
-        for lesson_token in lesson_list:
-            if is_next:
-                new_lesson = lesson_token
-            is_next = lesson_token == progress.active_lesson
+    if is_hw:
+        ProgressLesson.objects.get(
+            progress=progress,
+            lesson_token=lesson,
+            checker=progress.teacher,
+        )
 
-    progress.active_lesson = new_lesson
+    progress.active_lesson = lesson
     progress.save()
     return "access update course %s" % progress.course_token