diff --git a/cypress/platform/class.html b/cypress/platform/class.html
index aeb717d55..e10d4392c 100644
--- a/cypress/platform/class.html
+++ b/cypress/platform/class.html
@@ -50,6 +50,10 @@
         classA -- classC : link
         classC -- classD : link
         classB -- classD
+
+        Customer "1" --> "*" Ticket
+    Student "1" --> "1..*" Course
+    Galaxy --> "many" Star : Contains
       </div>
       <script src="./mermaid.js"></script>
     <script>
diff --git a/src/diagrams/class/classRenderer-v2.js b/src/diagrams/class/classRenderer-v2.js
index 4aec3f55b..a2ad31c0d 100644
--- a/src/diagrams/class/classRenderer-v2.js
+++ b/src/diagrams/class/classRenderer-v2.js
@@ -155,12 +155,11 @@ export const addRelations = function(relations, g) {
     }
 
     logger.info(edgeData, edge);
-
     //Set edge extra labels
-    edgeData.startLabelLeft = 'TL';
-    edgeData.startLabelRight = 'TR';
-    edgeData.endLabelLeft = 'BL';
-    edgeData.endLabelRight = 'BR';
+    //edgeData.startLabelLeft = edge.relationTitle1;
+    edgeData.startLabelRight = edge.relationTitle1 === 'none' ? '' : edge.relationTitle1;
+    edgeData.endLabelLeft = edge.relationTitle2 === 'none' ? '' : edge.relationTitle2;
+    //edgeData.endLabelRight = edge.relationTitle2;
 
     //Set relation arrow types
     edgeData.arrowTypeStart = getArrowMarker(edge.relation.type1);