diff --git a/HeatUp/src/de/heatup/ui/actionPanel/ActionControl.java b/HeatUp/src/de/heatup/ui/actionPanel/ActionControl.java
index e55fe71..2493d0c 100644
--- a/HeatUp/src/de/heatup/ui/actionPanel/ActionControl.java
+++ b/HeatUp/src/de/heatup/ui/actionPanel/ActionControl.java
@@ -64,13 +64,13 @@ public class ActionControl{
 					}
 				}else{
 					afterTime=System.nanoTime()-beforeTime;
-					count=0;
-					time=!time;
-					ActionWatcher.setAction(false);
 					if(afterTime>8_000_000_000L){
 						actionLabel.setText("Fehlgeschlagen");
 					}else{
 						actionLabel.setText("Manipulation erfolgreich!");
+						count=0;
+						time=!time;
+						ActionWatcher.setAction(false);
 						HardewareManipulate.setHardware(MapGrid.getGridCell(GameLoopD.player01.getGridLocation().x, GameLoopD.player01.getGridLocation().y).getCorrespondingHardwareToTrigger());
 					}
 				}
diff --git a/HeatUp/src/de/heatup/ui/actionPanel/ActionWatcher.java b/HeatUp/src/de/heatup/ui/actionPanel/ActionWatcher.java
index 140456e..8a5826c 100644
--- a/HeatUp/src/de/heatup/ui/actionPanel/ActionWatcher.java
+++ b/HeatUp/src/de/heatup/ui/actionPanel/ActionWatcher.java
@@ -25,9 +25,12 @@ public class ActionWatcher{
 	}
 	public static void tick(){
 		//Taucht auf, falls man in der Näche von einem Hardwareteil steht
-		if(MapGrid.getGridCell(GameLoopD.player01.getGridLocation().x, GameLoopD.player01.getGridLocation().y).isTrigger() && !action && !setaction
-				&& !HardewareManipulate.getHardware(MapGrid.getGridCell(GameLoopD.player01.getGridLocation().x, GameLoopD.player01.getGridLocation().y).getCorrespondingHardwareToTrigger())){
-			ActionControl.actionLabel.setText("Taste A druecken");	
+		if(MapGrid.getGridCell(GameLoopD.player01.getGridLocation().x, GameLoopD.player01.getGridLocation().y).isTrigger() && !action && !setaction){
+			if(!HardewareManipulate.getHardware(MapGrid.getGridCell(GameLoopD.player01.getGridLocation().x, GameLoopD.player01.getGridLocation().y).getCorrespondingHardwareToTrigger())){
+				ActionControl.actionLabel.setText("Taste A druecken");
+			}else{
+				ActionControl.actionLabel.setText("Bereits Manipuliert");
+			}
 		}
 		//Entfernt jeglichen Text wenn man sich von dem Hardwarestück entfernt und noch nicht A gedrückt hat
 		if(!MapGrid.getGridCell(GameLoopD.player01.getGridLocation().x, GameLoopD.player01.getGridLocation().y).isTrigger() && !action && !setaction){