diff --git a/main.cpp b/main.cpp
index 06ee6e5..d814b82 100644
--- a/main.cpp
+++ b/main.cpp
@@ -42,15 +42,7 @@ int main(int argc, char *argv[]) {
     Serial serial(115200);
 	uint8_t last_state = mcuData.state;
     thread receive(uartReceive, &serial);
-
-	thread change([&]() {
-		while (true) {
-			Sleep(10000);
-			if (mcuData.state == ARMOR_STATE) mcuData.state = ENERGY_STATE;
-			else if (mcuData.state == ENERGY_STATE)mcuData.state = ARMOR_STATE;
-			cout << "state changed to " << mcuData.state << endl;
-		}
-	});
+    bool keep = true;
 
     int from_camera = 1;
     if (!run_with_camera) {
@@ -58,7 +50,7 @@ int main(int argc, char *argv[]) {
         cin >> from_camera;
     }
 
-    while (true) {
+    while (keep) {
         VideoWriter armor_video_writer, energy_video_writer;
         if (save_video) {
             initVideoWriter(armor_video_writer, PROJECT_DIR"/armor_video/");
@@ -111,7 +103,6 @@ int main(int argc, char *argv[]) {
                 if (mcuData.state == ENERGY_STATE) {
 					if (last_state == ARMOR_STATE) {
 						energy.setEnergyRotationInit();
-						cout << "set" << endl;
 					}
 					last_state = mcuData.state;
                     if (video_energy) {
@@ -166,9 +157,9 @@ int main(int argc, char *argv[]) {
                         }
                     }
                 }
-				waitKey(1);
-				
-				
+				if(waitKey(1) == 'q'){
+				    keep = false;
+				}
             });
         } while (ok);
 
diff --git a/tools/bind-monitor.sh b/tools/bind-monitor.sh
index 6eaa339..0e09f2b 100755
--- a/tools/bind-monitor.sh
+++ b/tools/bind-monitor.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
 
 echo "#!/bin/bash" > $2/monitor-run
-echo "gnome-terminal -- bash -c \"echo sjturm | sudo -S $1/tools/monitor.sh \\\"$2/run --run-with-camera --show-armor-box --wait-uart\\\"\"" >> $2/monitor-run
+echo "gnome-terminal -- bash -c \"echo sjturm | sudo -S $1/tools/monitor.sh \\\"$2/run --run-with-camera --show-armor-box --wait-uart --save-video\\\"\"" >> $2/monitor-run
 chmod +x $2/monitor-run