diff --git a/avr_usart.c b/avr_usart.c
index 52706a1..19d307b 100644
--- a/avr_usart.c
+++ b/avr_usart.c
@@ -26,9 +26,6 @@ int main() {
 
     //enable interrupts
     sei();
-    unsigned char linefeed = 0x0a;
-    unsigned char carrigereturn = 0x0d; 
-    //unsigned char data[11] = "snd 11chars";
     unsigned char data[8] = "AT+BAUD3";
     unsigned char data_cmd[2] = "AT";
     uint8_t data_len = 8;
@@ -38,9 +35,6 @@ int main() {
         led_blink();
         
         serial0_write(data, data_len);
-        tx_usart0(carrigereturn);
-        tx_usart0(linefeed);
-        
 
         //_delay_ms(1000);
         _delay_ms(500);
@@ -148,6 +142,15 @@ void serial0_write(unsigned char* buffer, uint8_t write_length) {
     for(uint8_t i = 0; i < write_length; i++) {
         tx_usart0(buffer[i]);
     }
+
+    #if CARRIAGE_RETURN
+        tx_usart0(0x0d);
+    #endif
+
+    #if LINE_FEED
+        tx_usart0(0x0a);
+    #endif
+
 }
 
 /*
diff --git a/avr_usart.h b/avr_usart.h
index 4d6609f..4d0f991 100644
--- a/avr_usart.h
+++ b/avr_usart.h
@@ -44,6 +44,8 @@
 #define CLOCK_POL 0
 #define PARITY_BITS 0
 #define PARITY_POS 0
+#define CARRIAGE_RETURN 0
+#define LINE_FEED 0