diff --git a/index.html b/index.html
index b13b7b9..d0b0c96 100644
--- a/index.html
+++ b/index.html
@@ -13,9 +13,6 @@
     <textarea id="fj-input">
  class Test extends Object{}
 </textarea>
-          <!-- let rec recursive_monster = fun x ->
-        { thing = x;
-          self = recursive_monster x } -->
       </div>
       <div id="right">
           <pre><div id="ast-output"></div></pre>
@@ -27,10 +24,6 @@
   <script type="text/javascript" src="highlight.min.js"></script>
   <script type="text/javascript" src="target/scala-2.13/fj-typeinference-fastopt/main.js"></script>
   <br/>
-  <p>
-      Hint: The type inference algorithm processes one class at a time and starts with the first declared class.
-      Classes can therefore only use methods from classes declared before them.
-  </p>
-  <p>Credit: the CSS style sheet of this page was shamelessly stolen from <a href="https://github.com/LPTK/simple-algebraic-subtyping">the Simple-sub demo page</a>.</p>
+  <p>Credit: the layout of this page was shamelessly stolen from <a href="https://github.com/LPTK/simple-algebraic-subtyping">the Simple-sub demo page</a>.</p>
   </body>
 </html>
diff --git a/src/main/scala/hb/dhbw/Unify.scala b/src/main/scala/hb/dhbw/Unify.scala
index 104703c..7bf3e0a 100644
--- a/src/main/scala/hb/dhbw/Unify.scala
+++ b/src/main/scala/hb/dhbw/Unify.scala
@@ -47,7 +47,7 @@ object Unify {
       val eqSet = it.get
       val rulesResult = applyRules(fc)(eqSet.flatten)
       val step2Result = step2(rulesResult, fc)
-      while(step2Result.hasNext() && results.isEmpty){
+      while(step2Result.hasNext()){
         val substResult = substStep(step2Result.nextProduct().flatten)
         substResult match{
           case UnchangedSet(eq) => if(isSolvedForm(eq)){
diff --git a/src/test/scala/IntegrationTest.scala b/src/test/scala/IntegrationTest.scala
index 446b027..3ebbb9e 100644
--- a/src/test/scala/IntegrationTest.scala
+++ b/src/test/scala/IntegrationTest.scala
@@ -78,4 +78,23 @@ class IntegrationTest extends FunSuite {
     val result = FJTypeinference.typeinference(input )
     println(result.map(it => Main.prettyPrintAST(it._2)))
   }
+
+  test("functionClass") {
+    val input = "class SameType<A extends Object, B extends Object> extends Object{\nA a;\nA b;\nB c;\nget(){return this.c;}\n}\nclass Function<A extends Object, B extends Object> extends Object{\nA ret;\nB param;\napply(a){\nreturn new SameType(this.param, a, this).get().ret;\n}\n\n}"
+    val result = FJTypeinference.typeinference(input )
+    println(result.map(it => Main.prettyPrintAST(it._2)))
+  }
+    /*
+  Additional Tests:
+
+class Test extends Object{
+ m(a, b){return a;}
+m(a,b){return b;}
+}
+
+class Test2 extends Object{
+test(a){return new Test().m(this,a);}
+}
+
+   */
 }