diff --git a/doc/dev_infrastructure/.project b/doc/dev_infrastructure/.project
index cdc78f1fbe94645e04cc0e435199d2fb6353ea60..da6376a35ead51a612869efbe1711c6881041fee 100644
--- a/doc/dev_infrastructure/.project
+++ b/doc/dev_infrastructure/.project
@@ -6,12 +6,12 @@
 	</projects>
 	<buildSpec>
 		<buildCommand>
-			<name>net.sourceforge.texlipse.builder.TexlipseBuilder</name>
+			<name>org.eclipse.texlipse.builder.TexlipseBuilder</name>
 			<arguments>
 			</arguments>
 		</buildCommand>
 	</buildSpec>
 	<natures>
-		<nature>net.sourceforge.texlipse.builder.TexlipseNature</nature>
+		<nature>org.eclipse.texlipse.builder.TexlipseNature</nature>
 	</natures>
 </projectDescription>
diff --git a/src/main/java/ui/MainGUI.java b/src/main/java/ui/MainGUI.java
index 5b3b8980f3f1eda376d7f9732f19cfe04805a746..995bbddb59100e4467f98956f2adae49c77b58fa 100644
--- a/src/main/java/ui/MainGUI.java
+++ b/src/main/java/ui/MainGUI.java
@@ -635,8 +635,10 @@ public class MainGUI implements ActionListener, WindowListener, KeyListener, Per
         }
         //TraceManager.addDev("Change made!");
         
-        // Issue #81: For tests
-        if ( gtm != null ) {
+        // Issue #81: For tests when gtm could be null
+        if ( 	gtm != null && 
+        		type != TDiagramPanel.SELECT_COMPONENT ) { // Issue #105 
+        	TraceManager.addDev( "Saving current state for undo..." );
         	gtm.saveOperation(p);
         }
         
@@ -9116,7 +9118,7 @@ public class MainGUI implements ActionListener, WindowListener, KeyListener, Per
     }
     
     public boolean isAValidTabName(String name) {
-        boolean b1, b2, b3, b4, b5, b6, b7;
+        boolean b1, b2;//, b3, b4, b5, b6, b7;
         b1 = (name.substring(0, 1)).matches("[a-zA-Z]");
         b2 = name.matches("\\w*");
         return b1&&b2;
diff --git a/src/main/java/ui/ProactiveDesignPanel.java b/src/main/java/ui/ProactiveDesignPanel.java
index ad0879bf1cd5114824bc90c64fa3cfe5eff26750..ff64737d7fe6a219baef5cc5afb2fc2852ecda39 100644
--- a/src/main/java/ui/ProactiveDesignPanel.java
+++ b/src/main/java/ui/ProactiveDesignPanel.java
@@ -294,23 +294,14 @@ public class ProactiveDesignPanel extends TURTLEPanel {
         return null;
     }
 
-    
-    
-    
- public void renamePanel(TDiagramPanel tdp,String newName)
- {	
-	 //int index=this.tabbedPane.indexOfComponent((ProactiveSMDPanel)tdp);
-	   int index=tabbedPane.indexOfTab(tdp.name); 
-	 
-	   if (index!=-1)
-	   {
-	    tabbedPane.setTitleAt(index, newName);
-         panels.elementAt(index).setName(newName);
-          mgui.changeMade(null, -1);
-	   } 
- }
-
-
-
+    public void renamePanel(TDiagramPanel tdp,String newName) {	
+    	//int index=this.tabbedPane.indexOfComponent((ProactiveSMDPanel)tdp);
+    	int index=tabbedPane.indexOfTab(tdp.name); 
 
+    	if (index!=-1) {
+    		tabbedPane.setTitleAt(index, newName);
+    		panels.elementAt(index).setName(newName);
+    		mgui.changeMade(null, -1);
+    	} 
+    }
 }
diff --git a/src/main/java/ui/TDiagramMouseManager.java b/src/main/java/ui/TDiagramMouseManager.java
index 493f39a2fea13514ac1491a30b150797d16dd443..7b02eca06db0e3e5e3acfb69aff0d97aee1eb993 100644
--- a/src/main/java/ui/TDiagramMouseManager.java
+++ b/src/main/java/ui/TDiagramMouseManager.java
@@ -509,7 +509,10 @@ public class TDiagramMouseManager extends MouseAdapter {//implements MouseListen
      	   // lastSelectedComponent = null;
      	    tdp.componentPointed = null;
         }
-        tdp.getGUI().changeMade(tdp, TDiagramPanel.CHANGE_VALUE_COMPONENT);
+        
+ 	    // Issue #105: sending a change event prevents the undo from working
+ 	    tdp.getGUI().changeMade(tdp, TDiagramPanel.SELECT_COMPONENT);
+//        tdp.getGUI().changeMade(tdp, TDiagramPanel.CHANGE_VALUE_COMPONENT);
 	    tdp.repaint();
     }
     
diff --git a/src/main/java/ui/TDiagramPanel.java b/src/main/java/ui/TDiagramPanel.java
index 484f4c108689763dcedce198b1c7e15d809a6288..1704ae0812d9260ba2b97cdcc4311108c87efdf2 100644
--- a/src/main/java/ui/TDiagramPanel.java
+++ b/src/main/java/ui/TDiagramPanel.java
@@ -107,6 +107,9 @@ public abstract class TDiagramPanel extends JPanel implements GenericTree {
     // Issue #14
     public static final int DIAGRAM_RESIZED = 6;
 
+    // Issue #105
+    public static final int SELECT_COMPONENT = 7;
+
     // For cut/copy/paste
     public static String copyData;
     /*private static int copyX;