diff --git a/client/src/stores/learningPath.ts b/client/src/stores/learningPath.ts
index e2f605c7..ed7c224c 100644
--- a/client/src/stores/learningPath.ts
+++ b/client/src/stores/learningPath.ts
@@ -24,11 +24,6 @@ function getFirstLearningContent(lastCopleted, learningPathData) {
   let currentCircle = Circle.fromJson(circles[0])
   const currentLearningUnit = currentCircle.flatChildren[0]
   let currentLearningSequence = currentLearningUnit.parentLearningSequence
-
-  // delete currentCircle.children
-  // delete currentLearningUnit.children
-  // delete currentLearningSequence.children
-
   return [currentCircle, currentLearningSequence, currentLearningUnit]
 }
 
@@ -39,23 +34,23 @@ function getNextLearningContent(lastCopleted, learningPathData) {
   currentLearningUnit = getFirstLearningContent(lastCopleted, learningPathData)
 
   if (lastCopleted) {
+    const circles = _.filter(learningPathData.children, {'type': 'learnpath.Circle'})
     _.forEach(circles, circle => {
-      currentCircle = circle
-
-      debugger
-      //
-      // _.forEach(circle.children, learningSequence => {
-      //   currentLearningSequence = learningSequence
-      //   _.forEach(learningSequence.children, learningUnit => {
-      //       currentLearningUnit = learningUnit
-      //       console.log(lastCopleted.page_key, learningUnit.translation_key)
-      //       if (lastCopleted.page_key === learningUnit.translation_key)
-      //         return false
-      //     }
-      //   )
-      // });
+      _.forEach(Circle.fromJson(circle).learningSequences, learningSequence => {
+        currentLearningSequence = learningSequence
+        _.forEach(learningSequence.learningUnits, learningUnit => {
+          _.forEach(learningUnit.learningContents, content => {
+            console.log(lastCopleted, content)
+            if (lastCopleted.page_key === content.translation_key) {
+              currentCircle = Circle.fromJson(circle)
+              currentLearningSequence = learningSequence
+              currentLearningUnit = content
+            }
+          })
+        })
+      })
     })
-
+    currentLearningUnit = [currentCircle, currentLearningSequence, currentLearningUnit]
   }
   return currentLearningUnit
 }