diff --git a/hw04/oglwidget.cpp b/hw04/oglwidget.cpp
index f96660f..0078d70 100644
--- a/hw04/oglwidget.cpp
+++ b/hw04/oglwidget.cpp
@@ -98,6 +98,10 @@
 
 void subDivLoop();
 
+int matchEdge(Tri tri, int vertex, int vertex1);
+
+void connectivityAlgo();
+
 Tri::Tri() {
     it[0] = -1;
     it[1] = -1;
@@ -133,12 +137,17 @@
     pts[iv[1]].Print();
     cout << " - " << valences[iv[2]] << "x ";
     pts[iv[2]].Print();
+    cout << endl << "Edges: " << ie[0] << " " << ie[1] << " " << ie[2] << endl;
+//    pts[ie[0]].Print();
+//    pts[ie[1]].Print();
+//    pts[ie[2]].Print();
+
     cout << endl;
 }
 
 float beta_n( int n)
 {
-    float an = (3.0f/8.0f) + pow((3.0f/8.0f) + (1.0f/4.0f)*cos(2.0f*PI/n), 2);
+    float an = (3.0f/8.0f) + float(pow((3.0f/8.0f) + (1.0f/4.0f)*cos(2.0f*PI/n), 2));
 
     return (8.0f/5.0f)*an - (3.0f/5.0f);
 }
@@ -176,24 +185,42 @@
 //    subDivEdgeMidpoint();
 //    subDivEdgeMidpoint();
 
+
+
+//    for (auto triag : tris) {
+//        triag.Print();
+//    }
+
+}
+
+void connectivityAlgo() {
+    for (int i = 0; i < pts.size(); ++i) {
+        valences[i] = 0;
+    }
+
     // Connectivity Algorithm
     for (int i = 0; i < tris.size(); ++i) {
         Tri triag = tris[i];
-        int n = 0;
         // Search for neighbour
         for (int ti = 0; ti < tris.size(); ++ti) {
             if (i == ti) continue;
             Tri t = tris[ti];
             int count = 0;
-            for (int x : triag.iv) {
+            int side = 0;
+            for (int x = 0; x < 3; ++x) {
+                bool hit = false;
                 for (int y : t.iv) {
-                    if (x == y)
-                        count++;
+                    if (triag.iv[x] == y)
+                        hit = true;
                 }
+                if (hit)
+                    count++;
+                else
+                    side = x;
             }
             // if two points are the same, they are neighbours
             if (count == 2)
-                triag.it[n++] = ti;
+                triag.it[side] = ti;
         }
 
         // increase valence for each vertex of triangle
@@ -203,23 +230,46 @@
 
         tris[i] = triag;
     }
-
-
-    for (auto triag : tris) {
-        triag.Print();
-    }
-    subDivLoop();
-
-
-    saveData();
 }
 
 void subDivLoop() {
 
+    for (int i = 0; i < tris.size(); ++i) {
+        Tri triag = tris[i];
+        Vertex a = pts[triag.iv[0]];
+        Vertex b = pts[triag.iv[1]];
+        Vertex c = pts[triag.iv[2]];
+
+        for (int tI = 0; tI < 3; ++tI) {
+            Tri t = tris[triag.it[tI]];
+            int otherEI = 0;
+            for (int j = 0; j < 3; ++j) {
+                if (t.it[j] == i) {
+                    otherEI = j;
+                    break;
+                }
+            }
+            if (i < triag.it[tI]) {
+                Vertex d = pts[t.iv[otherEI]];
+                Vertex e = (1.0f/8.0f)*((((tI == 1 || tI == 2) ? 3.0f : 1.0f)*a) + (((tI == 0 || tI == 2) ? 3.0f : 1.0f)*b) + (((tI == 1 || tI == 0) ? 3.0f : 1.0f)*c) + d);
+                triag.ie[tI] = pts.size();
+                pts.push_back(e);
+                valences.push_back(0);
+            } else {
+                // edge-mask already calculated
+
+                triag.ie[tI] = t.ie[otherEI];
+            }
+        }
+
+        tris[i] = triag;
+    }
+
     for( int i=0; i< pts.size(); i++){ // multiply every vertex with beta
-        break;
         int n = valences[i]; // n = valence of v_i
+        if (n < 3) continue;
         float beta = beta_n( n);
+        cout << i << " " << n << " " << beta << " " <<endl;
         pts[i] *= beta; // v_i *= beta(n)
     }
 
@@ -234,90 +284,27 @@
         int ci = triag.iv[2];
         Vertex c = pts[ci];
 
-        Vertex d;
-        for (int ti : triag.it) {
-            int di = -1;
-            Tri t = tris[ti];
-            int count = 0;
-            for (int y : t.iv) {
-                if (ci == y || bi == y)
-                    count++;
-                else
-                    di = y;
-            }
-            if (count == 2) {
-                cout << " 1: " << di;
-                d = pts[di];
-                break;
-            }
+
+        Vertex e[3] = {};
+
+        for (int tI = 0; tI < 3; ++tI) {
+            e[tI] = pts[triag.ie[tI]];
         }
 
-        Vertex e0 = (1.0f/8.0f)*(a + (3.0f*b) + (3.0f*c) + d);
-        triag.ie[0] = pts.size();
-        pts.push_back(e0);
-        valences.push_back(0);
+        cout << triag.ie[0] << " " << triag.ie[1] << " " << triag.ie[2] << endl;
+        cout << e[0].p[0] << " " << e[0].p[1] << " " << e[0].p[2] << endl;
+        cout << e[1].p[0] << " " << e[1].p[1] << " " << e[1].p[2] << endl;
+        cout << e[2].p[0] << " " << e[2].p[1] << " " << e[2].p[2] << endl << endl;
 
 
-
-        for (auto ti: triag.it) {
-            int di = -1;
-            Tri t = tris[ti];
-            int count = 0;
-            for (int y : t.iv) {
-                if (ai == y || ci == y)
-                    count++;
-                else
-                    di = y;
-            }
-            if (count == 2) {
-                cout << " 2: " << di;
-                d = pts[di];
-                break;
-            }
-        }
-
-        Vertex e1 = (1.0f/8.0f)*((3.0f*a) + b + (3.0f*c) + d);
-        triag.ie[1] = pts.size();
-        pts.push_back(e1);
-        valences.push_back(0);
+        a += (0.5f * ((1-beta_n(valences[ai])) / float(valences[ai])) * (e[1] + e[2]));
+        b += (0.5f * ((1-beta_n(valences[bi])) / float(valences[bi])) * (e[0] + e[2]));
+        c += (0.5f * ((1-beta_n(valences[ci])) / float(valences[ci])) * (e[1] + e[0]));
 
 
-        for (auto ti: triag.it) {
-            int di = -1;
-            Tri t = tris[ti];
-            int count = 0;
-            for (int y : t.iv) {
-                if (ai == y || bi == y)
-                    count++;
-                else
-                    di = y;
-            }
-            if (count == 2) {
-                cout << " 3: " << di << endl;
-                d = pts[di];
-                break;
-            }
-        }
-
-        Vertex e2 = (1.0f/8.0f)*((3.0f*a) + (3.0f*b) + c + d);
-        triag.ie[2] = pts.size();
-        pts.push_back(e2);
-        valences.push_back(0);
-
-
-        cout << e0.p[0] << " " << e0.p[1] << " " << e0.p[2] << endl;
-        cout << e1.p[0] << " " << e1.p[1] << " " << e1.p[2] << endl;
-        cout << e2.p[0] << " " << e2.p[1] << " " << e2.p[2] << endl << endl;
-
-
-//        a += ((1-beta_n(valences[ai])) / (valences[ai])) * (0.5f * (e1 + e2));
-//        b += ((1-beta_n(valences[bi])) / (valences[bi])) * (0.5f * (e0 + e2));
-//        c += ((1-beta_n(valences[ci])) / (valences[ci])) * (0.5f * (e1 + e0));
-
-
-//        pts[ai] = a;
-//        pts[bi] = b;
-//        pts[ci] = c;
+        pts[ai] = a;
+        pts[bi] = b;
+        pts[ci] = c;
 
 
         triag.iv[0] = triag.ie[1];
@@ -325,7 +312,6 @@
         triag.iv[2] = ci;
 
         tris[i] = triag;
-//        continue;
 
         tris.push_back(*new Tri(triag.ie[1], triag.ie[2], triag.ie[0]));
         tris.push_back(*new Tri(ai, triag.ie[2], triag.ie[1]));
@@ -334,6 +320,18 @@
 
 }
 
+int matchEdge(Tri tri, int vertex, int vertex1) {
+    int count = 0;
+    int otherVert = -1;
+    for (int i = 0; i < 3; ++i) {
+        if (tri.iv[i] == vertex || tri.iv[i] == vertex1)
+            ++count;
+        else
+            otherVert = i;
+    }
+    return (count == 2) ? otherVert : -1;
+}
+
 void saveData() {
     string fname = R"(C:\CLionProjects\cg\hw04\test2.obj)";
     ofstream file( fname);
@@ -424,11 +422,29 @@
     }
     glEnd();
 
-    glBegin(GL_POINTS);
-    for (auto vert : pts) {
-        glVertex3fv(vert.p);
-    }
-    glEnd();
+//    glPolygonMode(GL_FRONT_AND_BACK , GL_LINE);
+//    glBegin( GL_TRIANGLES);
+//    for (int i = meshDivider; i < tris.size(); ++i) {
+//        Tri tri = tris[i];
+//        Vertex a = pts[tri.iv[0]];
+//        Vertex b = pts[tri.iv[1]];
+//        Vertex c = pts[tri.iv[2]];
+//        Vertex nvec = (b-a)%(c-a);
+//
+//        glNormal3fv(nvec.p);
+//
+//        glVertex3fv(a.p);
+//        glVertex3fv(c.p);
+//        glVertex3fv(b.p);
+//
+//    }
+//    glEnd();
+
+//    glBegin(GL_POINTS);
+//    for (auto vert : pts) {
+//        glVertex3fv(vert.p);
+//    }
+//    glEnd();
 }
 
 // initialize Open GL lighting and projection matrix
@@ -522,6 +538,12 @@
     InitLightingAndProjection(); // define light sources and projection
 
     loadData();
+
+    connectivityAlgo();
+    subDivLoop();
+
+    saveData();
+
 }
 
 void OGLWidget::paintGL() // draw everything, to be called repeatedly

diff --git a/hw04/oglwidget.cpp b/hw04/oglwidget.cpp
index f96660f..0078d70 100644
--- a/hw04/oglwidget.cpp
+++ b/hw04/oglwidget.cpp
@@ -98,6 +98,10 @@
 
 void subDivLoop();
 
+int matchEdge(Tri tri, int vertex, int vertex1);
+
+void connectivityAlgo();
+
 Tri::Tri() {
     it[0] = -1;
     it[1] = -1;
@@ -133,12 +137,17 @@
     pts[iv[1]].Print();
     cout << " - " << valences[iv[2]] << "x ";
     pts[iv[2]].Print();
+    cout << endl << "Edges: " << ie[0] << " " << ie[1] << " " << ie[2] << endl;
+//    pts[ie[0]].Print();
+//    pts[ie[1]].Print();
+//    pts[ie[2]].Print();
+
     cout << endl;
 }
 
 float beta_n( int n)
 {
-    float an = (3.0f/8.0f) + pow((3.0f/8.0f) + (1.0f/4.0f)*cos(2.0f*PI/n), 2);
+    float an = (3.0f/8.0f) + float(pow((3.0f/8.0f) + (1.0f/4.0f)*cos(2.0f*PI/n), 2));
 
     return (8.0f/5.0f)*an - (3.0f/5.0f);
 }
@@ -176,24 +185,42 @@
 //    subDivEdgeMidpoint();
 //    subDivEdgeMidpoint();
 
+
+
+//    for (auto triag : tris) {
+//        triag.Print();
+//    }
+
+}
+
+void connectivityAlgo() {
+    for (int i = 0; i < pts.size(); ++i) {
+        valences[i] = 0;
+    }
+
     // Connectivity Algorithm
     for (int i = 0; i < tris.size(); ++i) {
         Tri triag = tris[i];
-        int n = 0;
         // Search for neighbour
         for (int ti = 0; ti < tris.size(); ++ti) {
             if (i == ti) continue;
             Tri t = tris[ti];
             int count = 0;
-            for (int x : triag.iv) {
+            int side = 0;
+            for (int x = 0; x < 3; ++x) {
+                bool hit = false;
                 for (int y : t.iv) {
-                    if (x == y)
-                        count++;
+                    if (triag.iv[x] == y)
+                        hit = true;
                 }
+                if (hit)
+                    count++;
+                else
+                    side = x;
             }
             // if two points are the same, they are neighbours
             if (count == 2)
-                triag.it[n++] = ti;
+                triag.it[side] = ti;
         }
 
         // increase valence for each vertex of triangle
@@ -203,23 +230,46 @@
 
         tris[i] = triag;
     }
-
-
-    for (auto triag : tris) {
-        triag.Print();
-    }
-    subDivLoop();
-
-
-    saveData();
 }
 
 void subDivLoop() {
 
+    for (int i = 0; i < tris.size(); ++i) {
+        Tri triag = tris[i];
+        Vertex a = pts[triag.iv[0]];
+        Vertex b = pts[triag.iv[1]];
+        Vertex c = pts[triag.iv[2]];
+
+        for (int tI = 0; tI < 3; ++tI) {
+            Tri t = tris[triag.it[tI]];
+            int otherEI = 0;
+            for (int j = 0; j < 3; ++j) {
+                if (t.it[j] == i) {
+                    otherEI = j;
+                    break;
+                }
+            }
+            if (i < triag.it[tI]) {
+                Vertex d = pts[t.iv[otherEI]];
+                Vertex e = (1.0f/8.0f)*((((tI == 1 || tI == 2) ? 3.0f : 1.0f)*a) + (((tI == 0 || tI == 2) ? 3.0f : 1.0f)*b) + (((tI == 1 || tI == 0) ? 3.0f : 1.0f)*c) + d);
+                triag.ie[tI] = pts.size();
+                pts.push_back(e);
+                valences.push_back(0);
+            } else {
+                // edge-mask already calculated
+
+                triag.ie[tI] = t.ie[otherEI];
+            }
+        }
+
+        tris[i] = triag;
+    }
+
     for( int i=0; i< pts.size(); i++){ // multiply every vertex with beta
-        break;
         int n = valences[i]; // n = valence of v_i
+        if (n < 3) continue;
         float beta = beta_n( n);
+        cout << i << " " << n << " " << beta << " " <<endl;
         pts[i] *= beta; // v_i *= beta(n)
     }
 
@@ -234,90 +284,27 @@
         int ci = triag.iv[2];
         Vertex c = pts[ci];
 
-        Vertex d;
-        for (int ti : triag.it) {
-            int di = -1;
-            Tri t = tris[ti];
-            int count = 0;
-            for (int y : t.iv) {
-                if (ci == y || bi == y)
-                    count++;
-                else
-                    di = y;
-            }
-            if (count == 2) {
-                cout << " 1: " << di;
-                d = pts[di];
-                break;
-            }
+
+        Vertex e[3] = {};
+
+        for (int tI = 0; tI < 3; ++tI) {
+            e[tI] = pts[triag.ie[tI]];
         }
 
-        Vertex e0 = (1.0f/8.0f)*(a + (3.0f*b) + (3.0f*c) + d);
-        triag.ie[0] = pts.size();
-        pts.push_back(e0);
-        valences.push_back(0);
+        cout << triag.ie[0] << " " << triag.ie[1] << " " << triag.ie[2] << endl;
+        cout << e[0].p[0] << " " << e[0].p[1] << " " << e[0].p[2] << endl;
+        cout << e[1].p[0] << " " << e[1].p[1] << " " << e[1].p[2] << endl;
+        cout << e[2].p[0] << " " << e[2].p[1] << " " << e[2].p[2] << endl << endl;
 
 
-
-        for (auto ti: triag.it) {
-            int di = -1;
-            Tri t = tris[ti];
-            int count = 0;
-            for (int y : t.iv) {
-                if (ai == y || ci == y)
-                    count++;
-                else
-                    di = y;
-            }
-            if (count == 2) {
-                cout << " 2: " << di;
-                d = pts[di];
-                break;
-            }
-        }
-
-        Vertex e1 = (1.0f/8.0f)*((3.0f*a) + b + (3.0f*c) + d);
-        triag.ie[1] = pts.size();
-        pts.push_back(e1);
-        valences.push_back(0);
+        a += (0.5f * ((1-beta_n(valences[ai])) / float(valences[ai])) * (e[1] + e[2]));
+        b += (0.5f * ((1-beta_n(valences[bi])) / float(valences[bi])) * (e[0] + e[2]));
+        c += (0.5f * ((1-beta_n(valences[ci])) / float(valences[ci])) * (e[1] + e[0]));
 
 
-        for (auto ti: triag.it) {
-            int di = -1;
-            Tri t = tris[ti];
-            int count = 0;
-            for (int y : t.iv) {
-                if (ai == y || bi == y)
-                    count++;
-                else
-                    di = y;
-            }
-            if (count == 2) {
-                cout << " 3: " << di << endl;
-                d = pts[di];
-                break;
-            }
-        }
-
-        Vertex e2 = (1.0f/8.0f)*((3.0f*a) + (3.0f*b) + c + d);
-        triag.ie[2] = pts.size();
-        pts.push_back(e2);
-        valences.push_back(0);
-
-
-        cout << e0.p[0] << " " << e0.p[1] << " " << e0.p[2] << endl;
-        cout << e1.p[0] << " " << e1.p[1] << " " << e1.p[2] << endl;
-        cout << e2.p[0] << " " << e2.p[1] << " " << e2.p[2] << endl << endl;
-
-
-//        a += ((1-beta_n(valences[ai])) / (valences[ai])) * (0.5f * (e1 + e2));
-//        b += ((1-beta_n(valences[bi])) / (valences[bi])) * (0.5f * (e0 + e2));
-//        c += ((1-beta_n(valences[ci])) / (valences[ci])) * (0.5f * (e1 + e0));
-
-
-//        pts[ai] = a;
-//        pts[bi] = b;
-//        pts[ci] = c;
+        pts[ai] = a;
+        pts[bi] = b;
+        pts[ci] = c;
 
 
         triag.iv[0] = triag.ie[1];
@@ -325,7 +312,6 @@
         triag.iv[2] = ci;
 
         tris[i] = triag;
-//        continue;
 
         tris.push_back(*new Tri(triag.ie[1], triag.ie[2], triag.ie[0]));
         tris.push_back(*new Tri(ai, triag.ie[2], triag.ie[1]));
@@ -334,6 +320,18 @@
 
 }
 
+int matchEdge(Tri tri, int vertex, int vertex1) {
+    int count = 0;
+    int otherVert = -1;
+    for (int i = 0; i < 3; ++i) {
+        if (tri.iv[i] == vertex || tri.iv[i] == vertex1)
+            ++count;
+        else
+            otherVert = i;
+    }
+    return (count == 2) ? otherVert : -1;
+}
+
 void saveData() {
     string fname = R"(C:\CLionProjects\cg\hw04\test2.obj)";
     ofstream file( fname);
@@ -424,11 +422,29 @@
     }
     glEnd();
 
-    glBegin(GL_POINTS);
-    for (auto vert : pts) {
-        glVertex3fv(vert.p);
-    }
-    glEnd();
+//    glPolygonMode(GL_FRONT_AND_BACK , GL_LINE);
+//    glBegin( GL_TRIANGLES);
+//    for (int i = meshDivider; i < tris.size(); ++i) {
+//        Tri tri = tris[i];
+//        Vertex a = pts[tri.iv[0]];
+//        Vertex b = pts[tri.iv[1]];
+//        Vertex c = pts[tri.iv[2]];
+//        Vertex nvec = (b-a)%(c-a);
+//
+//        glNormal3fv(nvec.p);
+//
+//        glVertex3fv(a.p);
+//        glVertex3fv(c.p);
+//        glVertex3fv(b.p);
+//
+//    }
+//    glEnd();
+
+//    glBegin(GL_POINTS);
+//    for (auto vert : pts) {
+//        glVertex3fv(vert.p);
+//    }
+//    glEnd();
 }
 
 // initialize Open GL lighting and projection matrix
@@ -522,6 +538,12 @@
     InitLightingAndProjection(); // define light sources and projection
 
     loadData();
+
+    connectivityAlgo();
+    subDivLoop();
+
+    saveData();
+
 }
 
 void OGLWidget::paintGL() // draw everything, to be called repeatedly
diff --git a/hw04/test2.obj b/hw04/test2.obj
deleted file mode 100644
index 23acc46..0000000
--- a/hw04/test2.obj
+++ /dev/null
@@ -1,26 +0,0 @@
-v	0	0	0
-v	8	0	0
-v	0	8	0
-v	0	0	8
-v	4	0	0
-v	4	0	4
-v	0	0	4
-v	4	4	0
-v	0	4	4
-v	0	4	0
-f	1	5	7
-f	2	8	6
-f	3	10	9
-f	3	8	10
-f	4	7	6
-f	2	5	6
-f	5	6	7
-f	4	6	9
-f	3	8	9
-f	8	9	6
-f	4	9	7
-f	1	10	7
-f	10	7	9
-f	1	10	5
-f	2	8	5
-f	8	5	10