diff --git a/src/ui/AvatarMADsPanel.java b/src/ui/AvatarMADsPanel.java
index ee55f987f3cb5e1381948dd690f099eeea05c3fe..97d338ace6978f5d1a21acd6edce8f9ed0e93c54 100644
--- a/src/ui/AvatarMADsPanel.java
+++ b/src/ui/AvatarMADsPanel.java
@@ -105,7 +105,7 @@ public class AvatarMADsPanel extends TURTLEPanel {
     public void init() {
          
         //  Class Diagram toolbar
-        AvatarMADToolBar toolBarAvatarMAD = new AvatarMADToolBar(mgui);
+        /*AvatarMADToolBar toolBarAvatarMAD = new AvatarMADToolBar(mgui);
         toolbars.add(toolBarAvatarMAD);
         
         toolBarPanel = new JPanel();
@@ -113,7 +113,7 @@ public class AvatarMADsPanel extends TURTLEPanel {
         
         //Class	diagram
         AvatarMADPanel amadp = new AvatarMADPanel(mgui, toolBarAvatarMAD);
-        amadp.setName("Model Assumption Diagram");
+        amadp.setName("Modeling Assumption Diagram");
         amadp.tp = this;
         tdp = amadp;
         panels.add(amadp); // Always first in list
@@ -127,13 +127,13 @@ public class AvatarMADsPanel extends TURTLEPanel {
         tabbedPane.setSelectedIndex(0);
         //tabbedPane.setMnemonicAt(tabbedPane.getTabCount()-1, '^');
         
-        //jsp.setVisible(true);
+        //jsp.setVisible(true);*/
  
     }
 	
     
     public String saveHeaderInXml() {
-        return "<Modeling type=\"AVATAR MAD\" nameTab=\"" + mgui.getTabName(this) + "\" >\n"; 
+        return "<Modeling type=\"Avatar MAD\" nameTab=\"" + mgui.getTabName(this) + "\" >\n"; 
     }
     
     public String saveTailInXml() {
@@ -141,9 +141,19 @@ public class AvatarMADsPanel extends TURTLEPanel {
     }
     
     public String toString() {
-        return mgui.getTitleAt(this) + " (AVATAR MAD)";
+        return mgui.getTitleAt(this) + " (Avatar MAD)";
     }
 	
 	
+    public boolean isAvatarMADEnabled() {
+        return true;
+    }
+    
+    public boolean removeEnabled(int index) {
+        return true;
+    }
     
+    public boolean renameEnabled(int index) {
+        return true;
+    }
 }
\ No newline at end of file
diff --git a/src/ui/GTURTLEModeling.java b/src/ui/GTURTLEModeling.java
index 3278a2f0a1a45c1bafaec925af5b7ea196080f14..6789e323b107ab97f19f722198a1a7d37b83f5e5 100755
--- a/src/ui/GTURTLEModeling.java
+++ b/src/ui/GTURTLEModeling.java
@@ -3626,13 +3626,15 @@ public class GTURTLEModeling {
 
 
 		nameTab = elt.getAttribute("nameTab");
+		
+		TraceManager.addDev("Creating MAD panel ");
 
 		indexReq = mgui.createAvatarMADs(nameTab);
 
 		diagramNl = node.getChildNodes();
 
 		for(int j=0; j<diagramNl.getLength(); j++) {
-			//TraceManager.addDev("Deployment nodes: " + j);
+			TraceManager.addDev("MADs nodes: " + j);
 			node = diagramNl.item(j);
 			if (node.getNodeType() == Node.ELEMENT_NODE) {
 				elt = (Element)node;
diff --git a/src/ui/TURTLEPanel.java b/src/ui/TURTLEPanel.java
index 0150b670d13913cc18c09f02c50d0988ca0d733f..21ab157c93083b661434f69ef371f3b248a35677 100755
--- a/src/ui/TURTLEPanel.java
+++ b/src/ui/TURTLEPanel.java
@@ -301,6 +301,10 @@ public abstract class TURTLEPanel implements GenericTree {
     public boolean isAvatarADEnabled() {
         return false;
     }
+    
+    public boolean isAvatarMADEnabled() {
+        return false;
+    }
 	
 	public MainGUI getMainGUI() {
 		return mgui;
diff --git a/src/ui/TURTLEPanelPopupListener.java b/src/ui/TURTLEPanelPopupListener.java
index 8269957787d875d54ddc01835796902f76a6616a..62057389334452bb843affd8112708a62dfbf037 100755
--- a/src/ui/TURTLEPanelPopupListener.java
+++ b/src/ui/TURTLEPanelPopupListener.java
@@ -60,7 +60,7 @@ public class TURTLEPanelPopupListener extends MouseAdapter /* popup menus onto t
     protected MainGUI mgui;
     
     private JMenuItem rename, remove, moveRight, moveLeft, sort, newucd, newsd, newsdfromucd, newreq, 
-	newebrdd, newprosmd, newavatarrd, newavatarpd, newavatarcd, newavatarad;
+	newebrdd, newprosmd, newavatarrd, newavatarpd, newavatarcd, newavatarad, newavatarmad;
     private JMenuItem newatd;
 	
     public TURTLEPanelPopupListener(TURTLEPanel _tp, MainGUI _mgui) {
@@ -104,6 +104,7 @@ public class TURTLEPanelPopupListener extends MouseAdapter /* popup menus onto t
 		newavatarpd = createMenuItem("New AVATAR Property Diagram");
 		newavatarcd = createMenuItem("New Context Diagram");
 		newavatarad = createMenuItem("New Activity Diagram");
+		newavatarmad = createMenuItem("New AVATAR Modeling Assumptions Diagram");
         
         menu = new JPopupMenu("TURTLE panel");
         menu.add(moveLeft);
@@ -129,6 +130,7 @@ public class TURTLEPanelPopupListener extends MouseAdapter /* popup menus onto t
         menu.add(newprosmd);
 		if (mgui.isAvatarOn()) {
 			menu.addSeparator();
+			menu.add(newavatarmad);
 			menu.add(newavatarrd);
 			menu.add(newavatarpd);
 		}
@@ -177,6 +179,7 @@ public class TURTLEPanelPopupListener extends MouseAdapter /* popup menus onto t
 		newavatarpd.setEnabled(tp.isAvatarPDEnabled());
 		newavatarcd.setEnabled(tp.isAvatarCDEnabled());
 		newavatarad.setEnabled(tp.isAvatarADEnabled());
+		newavatarmad.setEnabled(tp.isAvatarMADEnabled());
     }
     
     private Action listener = new AbstractAction() {
@@ -228,7 +231,10 @@ public class TURTLEPanelPopupListener extends MouseAdapter /* popup menus onto t
 			} else if (e.getSource() == newavatarad) {
 				mgui.createUniqueAvatarAD(tp, "Activity Diagram");
                 mgui.changeMade(null, -1);
-			}
+			} else if (e.getSource() == newavatarmad) {
+				mgui.createAvatarMAD(tp, "Modeling Assumptions Diagram");
+                mgui.changeMade(null, -1);
+			} 
         }
     };
 }