diff --git a/cubesatsim/cubesatsim.ino b/cubesatsim/cubesatsim.ino
index 0d707bb4..7d981cfe 100644
--- a/cubesatsim/cubesatsim.ino
+++ b/cubesatsim/cubesatsim.ino
@@ -49,8 +49,6 @@ Adafruit_INA219 ina219_2_0x41(0x41);
 Adafruit_INA219 ina219_2_0x44(0x44);
 Adafruit_INA219 ina219_2_0x45(0x45);
 
-char payload_str[100];
-
 WiFiServer server(port);
 WiFiClient client;
 
@@ -267,7 +265,10 @@ void read_reset_count() {
 void send_packet() {		
 //  digitalWrite(LED_BUILTIN, LOW);
 
-  char str[1000];	
+  char str[1000];
+  char header_str[] = "hi hi ";
+  strcpy(str, header_str);	
+  strcpy(str, tlm_str);	
   strcat(str, payload_str);	
   set_status(str);		
 	
@@ -277,21 +278,6 @@ void send_packet() {
   transmit_off();		
 }
 
-void transmit_on() {
-  if ((mode == AFSK) || (mode == SSTV)) {
-    Serial.println("Transmit on!");
-    digitalWrite(MAIN_LED_BLUE, HIGH);	
-    digitalWrite(PTT_PIN, LOW);
-  }
-  else if (mode == BPSK) {	
-    Serial.println("Transmit on!");
-    pwm_set_gpio_level(BPSK_PWM_A_PIN, (config.top + 1) * 0.5);
-    pwm_set_gpio_level(BPSK_PWM_B_PIN, (config.top + 1) * 0.5);	
-  }
-  else
-    Serial.println("No transmit!");
-}
-
 void send_cw() {
   char de[] = " HI HI DE ";	
   char telem[1000];
@@ -302,6 +288,8 @@ void send_cw() {
   strcpy(telem, de);
   strcat(telem, callsign);
   strcat(telem, space);
+  strcat(telem, tlm_str);
+  strcat(telem, space);
   strcat(telem, payload_str);
   print_string(telem);
   Serial.println(strlen(telem));
@@ -309,6 +297,21 @@ void send_cw() {
   transmit_string(telem);	
 }
 
+void transmit_on() {
+  if ((mode == AFSK) || (mode == SSTV)) {
+    Serial.println("Transmit on!");
+    digitalWrite(MAIN_LED_BLUE, HIGH);	
+    digitalWrite(PTT_PIN, LOW);
+  }
+  else if (mode == BPSK) {	
+    Serial.println("Transmit on!");
+    pwm_set_gpio_level(BPSK_PWM_A_PIN, (config.top + 1) * 0.5);
+    pwm_set_gpio_level(BPSK_PWM_B_PIN, (config.top + 1) * 0.5);	
+  }
+  else
+    Serial.println("No transmit!");
+}
+
 void transmit_off() {
   digitalWrite(PTT_PIN, HIGH);
   Serial.println("Transmit off!");
@@ -500,7 +503,6 @@ void get_tlm_ao7() {
     Serial.println(" ");
 */
     char str[1000];
-    char tlm_str[1000];	
     int channel;
     char header_str[] = "hi hi ";
     strcpy(str, header_str);