diff --git a/src/avatartranslator/directsimulation/AvatarSimulationBlock.java b/src/avatartranslator/directsimulation/AvatarSimulationBlock.java
index b955a6805edd67a50e3ac8ffde5988c83d9f4047..b851f1b7a882758c510b04b2691397ca63560f4d 100644
--- a/src/avatartranslator/directsimulation/AvatarSimulationBlock.java
+++ b/src/avatartranslator/directsimulation/AvatarSimulationBlock.java
@@ -288,7 +288,9 @@ public class AvatarSimulationBlock  {
 		ast.clockValueWhenPerformed = _clockValue;
 		if (_aspt != null) {
 			if (_aspt.hasClock) {
-				ast.duration = _aspt.selectedDuration;
+				if(lastTransaction != null) {
+					ast.duration = Math.min(_aspt.myMaxDuration, _aspt.selectedDuration + (_clockValue - lastTransaction.clockValueWhenPerformed));
+				}
 			}
 		}
 		ast.id = ast.setID();
diff --git a/src/ui/AvatarRequirementPanel.java b/src/ui/AvatarRequirementPanel.java
index 2055cb565dfe7f8e57a52030d11207822d1fff0e..a08074a824ca4d9a71220016b050ea9da7cbe3c2 100755
--- a/src/ui/AvatarRequirementPanel.java
+++ b/src/ui/AvatarRequirementPanel.java
@@ -171,9 +171,9 @@ public class AvatarRequirementPanel extends TURTLEPanel {
             return true;
         }
 		
-		/*if ((panels.elementAt(index) instanceof EBRDDPanel)){
+		if ((panels.elementAt(index) instanceof AvatarPDPanel)){
             return true;
-        }*/
+        }
 		
         return false;
     }
diff --git a/src/ui/RequirementPanel.java b/src/ui/RequirementPanel.java
index 2d5ff23ed43bd53c351cc4bda0ad34e6e87e0417..7e7bb27beb3bce46b3042ad356184261ac97732a 100755
--- a/src/ui/RequirementPanel.java
+++ b/src/ui/RequirementPanel.java
@@ -175,6 +175,7 @@ public class RequirementPanel extends TURTLEPanel {
             return true;
         }
 		
+		
         return false;
     }
     
diff --git a/src/ui/avatarinteractivesimulation/JFrameAvatarInteractiveSimulation.java b/src/ui/avatarinteractivesimulation/JFrameAvatarInteractiveSimulation.java
index 831154add709558835b485d388bdcd1545e7b631..d0a749c527e5779235162849c320dcb2bce7dae5 100755
--- a/src/ui/avatarinteractivesimulation/JFrameAvatarInteractiveSimulation.java
+++ b/src/ui/avatarinteractivesimulation/JFrameAvatarInteractiveSimulation.java
@@ -522,7 +522,7 @@ public	class JFrameAvatarInteractiveSimulation extends JFrame implements AvatarS
 		//jp01.add(animateWithInfo, c01);
 		animateWithInfo.addItemListener(this);
 		animateWithInfo.setSelected(true);
-		openDiagram = new JCheckBox("Automatically open active task diagram");
+		openDiagram = new JCheckBox("Automatically open active state machine diagram");
 		jp01.add(openDiagram, c01);
 		openDiagram.setSelected(true);
 		//update = new JCheckBox("Automatically update information (variables)");