diff --git a/lib/FT18_STW_DISPLAY/FT18_STW_DISPLAY.cpp b/lib/FT18_STW_DISPLAY/FT18_STW_DISPLAY.cpp
index b29b3b0..47c587e 100644
--- a/lib/FT18_STW_DISPLAY/FT18_STW_DISPLAY.cpp
+++ b/lib/FT18_STW_DISPLAY/FT18_STW_DISPLAY.cpp
@@ -54,7 +54,7 @@ String get_value(Value val) {
     }
     return String(Vehicle_data.gear);
   case VAL_RPM:
-    return String(Vehicle_data.revol);
+    return String(Vehicle_data.revol / 2);
   case VAL_TT_FL:
     return "00";
   case VAL_TT_FR:
@@ -64,7 +64,8 @@ String get_value(Value val) {
   case VAL_TT_RR:
     return "11";
   case VAL_LAPTIME:
-    return "93.13";
+    return String(
+        Vehicle_data.lap_time_sec + Vehicle_data.lap_time_msec / 1000.0, 2);
   case VAL_UBATT:
     return String(0.0706949 * Vehicle_data.u_batt, 2);
   case VAL_TMOT:
diff --git a/lib/FT18_STW_INIT/FT18_STW_INIT.h b/lib/FT18_STW_INIT/FT18_STW_INIT.h
index 03a593a..ee5b448 100644
--- a/lib/FT18_STW_INIT/FT18_STW_INIT.h
+++ b/lib/FT18_STW_INIT/FT18_STW_INIT.h
@@ -60,8 +60,8 @@ typedef struct {
   // uint8_t		i;						//Index
   // linker Drehschalter
   uint8_t buttonStateEnc1; // button
-  // uint8_t		br;						//test mode : mittlere
-  // Drehschalter position
+  // uint8_t		br;						//test mode :
+  // mittlere Drehschalter position
   uint8_t buttonStateEnc2; // button
   uint8_t displayindex;    // index für Displayanzeige
   uint8_t error_type;      // Extrainfos über Error-LED
@@ -92,7 +92,8 @@ typedef struct {
   uint8_t speed_fl;
   uint8_t speed_fr;
   uint8_t speed;
-
+  uint8_t lap_time_sec;
+  uint8_t lap_time_msec;
 } vehicle_data_type;
 
 extern volatile stw_data_type Stw_data;
diff --git a/lib/FT_2018_STW_CAN/FT_2018_STW_CAN.cpp b/lib/FT_2018_STW_CAN/FT_2018_STW_CAN.cpp
index 0ff59ff..3f61686 100644
--- a/lib/FT_2018_STW_CAN/FT_2018_STW_CAN.cpp
+++ b/lib/FT_2018_STW_CAN/FT_2018_STW_CAN.cpp
@@ -18,19 +18,18 @@ void Init_Can_0() {
   Can0.begin(1000000);   // set CAN0 baud to 1kbit/s and don`t use enable pin!
   Can0.setNumTXBoxes(1); // reserves mailbox 0 for tx only 8 mailboxes are
                          // available (the other 7 mailboxes are for rx)
-  Can0.watchFor(
-      0x502); // set CAN RX filter for ID 0x502 and reserves mailbox 1 for rx
-  Can0.watchFor(0x504);
-  Can0.watchFor(0x500);
-  Can0.watchFor(
-      0x773); // set CAN RX filter for ID 0x773 and reserves mailbox 3 for rx
-  Can0.watchFor(0x775);
-  //	Can0.watchFor(0x777);					// set CAN RX filter
-  //for ID 0x777 and reserves mailbox 5 for rx
-  Can0.watchFor(
-      0x779); // set CAN RX filter for ID 0x779 and reserves mailbox 6 for rx
-  Can0.watchFor(0x77A);
+
+  Can0.watchFor(CAN_ID_BCU_APS_BRAKE);
+  Can0.watchFor(CAN_ID_BCU_ETC);
+  Can0.watchFor(CAN_ID_BCU_SHIFT_CTRL);
+  Can0.watchFor(CAN_ID_BCU_LAP_TIME);
+  Can0.watchFor(CAN_ID_MS4_IGN_REV_ATH);
+  Can0.watchFor(CAN_ID_MS4_SPEED);
+  Can0.watchFor(CAN_ID_MS4_ETC);
+  Can0.watchFor(CAN_ID_MS4_STATES_TEMP_PRESS);
+
   Can0.setGeneralCallback(Receive_Can_0);
+
   Timer3.attachInterrupt(Send_0x110); // set send interrupt
   Timer3.start(10000);                // Calls every 10ms
 }
@@ -65,12 +64,13 @@ void Send_0x110() {
 
 void Receive_Can_0(CAN_FRAME *temp_message) {
   switch (temp_message->id) {
-  // g_auto
-  case 0x502: { // eDrossel error bit
-    Vehicle_data.e_thro = (temp_message->data.byte[0] & 0x80) |
-                          (temp_message->data.byte[0] & 0x40) |
-                          (temp_message->data.byte[0] & 0x20) |
-                          (temp_message->data.byte[0] & 0x10); // bit 4-7
+  case CAN_ID_BCU_APS_BRAKE: {
+    Vehicle_data.p_brake_front = temp_message->data.byte[1];
+    Vehicle_data.p_brake_rear = temp_message->data.byte[2];
+    break;
+  }
+  case CAN_ID_BCU_ETC: { // eDrossel error bit
+    Vehicle_data.e_thro = (temp_message->data.byte[0] & 0xF0); // bit 4-7
 
     if (temp_message->data.byte[0] & 0x80) {
       Stw_data.error_type = 1; //"pc_error";
@@ -84,60 +84,32 @@ void Receive_Can_0(CAN_FRAME *temp_message) {
     if (temp_message->data.byte[0] & 0x10) {
       Stw_data.error_type = 4; //"etb_error";
     }
-    // can_1_temp_data |= g_etb_e << 4;
-    // can_1_temp_data |= g_aps_e << 5;
-    // can_1_temp_data |= g_bse_e << 6;
-    // can_1_temp_data |= g_pc_e << 7;
     break;
   }
-  case 0x504: { // autoshift+gear
-    // Vehicle_data.g_auto					=
-    // (temp_message->data.byte[1])
-    // >> 4;
+  case CAN_ID_BCU_SHIFT_CTRL: { // autoshift+gear
     Vehicle_data.gear = (temp_message->data.byte[1]) >> 5;
     break;
   }
-  case 0x773: { // rpm
+  case CAN_ID_BCU_LAP_TIME: { // lap time
+    Vehicle_data.lap_time_sec = temp_message->data.byte[1];
+    Vehicle_data.lap_time_msec = temp_message->data.byte[1];
+  }
+  case CAN_ID_MS4_IGN_REV_ATH: { // rpm
     Vehicle_data.revol =
-        (temp_message->data.byte[4] | temp_message->data.byte[3] << 8);
+        (temp_message->data.byte[5] | temp_message->data.byte[4] << 8);
     break;
   }
-  case 0x779: { // battery voltage
+  case CAN_ID_MS4_SPEED: { // speed
+    Vehicle_data.speed_fl = 2 * (temp_message->data.byte[2]);
+    Vehicle_data.speed_fr = 2 * (temp_message->data.byte[3]);
+    Vehicle_data.speed = (Vehicle_data.speed_fl + Vehicle_data.speed_fr) / 2;
+    break;
+  }
+  case CAN_ID_MS4_ETC: { // battery voltage
     Vehicle_data.u_batt = temp_message->data.byte[6];
     break;
   }
-  /*case 0x77A: // revolution limit bit
-          Vehicle_data.rev_lim				=
-     (temp_message->data.byte[3] & 0x20) >> 4;
-          switch(temp_message->data.byte[0]) {
-                  case 0x02: // temp. intercooler
-                          Vehicle_data.t_air			=
-     temp_message->data.byte[7]; break; case 0x05: // temp. water
-                          Vehicle_data.t_mot			=
-     temp_message->data.byte[4]; break; case 0x04: // temp. oil
-                          Vehicle_data.t_oil			=
-     temp_message->data.byte[5]; case 0x01: {
-                          Vehicle_data.p_wat 			=
-     temp_message->data.byte[6]; Vehicle_data.p_fuel			=
-     temp_message->data.byte[7]; Vehicle_data.p_oil 			=
-     temp_message->data.byte[5]; break;
-                  }
-          }
-          break;*/
-  case 0x77A: { // temp und p
-    // g_ms4_idle_b			= (temp_message->data.byte[2] &
-    // 0b10000000)
-    // >> 7; g_ms4_engine_status		= (temp_message->data.byte[3] &
-    // 0b01000000) >> 6; g_ms4_ignoff_b			=
-    // (temp_message->data.byte[3] & 0b10000000) >> 7;
-    //  Serial.println("CAN 77A");
-    //  for (int i = 0; i < 8; i++) {
-    //  	Serial.print('[');
-    //  	Serial.print(i);
-    //  	Serial.print("] ");
-    //  	Serial.println(temp_message->data.byte[i], HEX);
-    //  }
-
+  case CAN_ID_MS4_STATES_TEMP_PRESS: { // temp und p
     if (temp_message->data.byte[0] == 1) {
       Vehicle_data.p_oil = temp_message->data.byte[5];
       Vehicle_data.p_fuel = temp_message->data.byte[7];
@@ -150,21 +122,6 @@ void Receive_Can_0(CAN_FRAME *temp_message) {
     }
     break;
   }
-  case 0x775: { // speed
-    Vehicle_data.speed_fl = 2 * (temp_message->data.byte[2]);
-    Vehicle_data.speed_fr = 2 * (temp_message->data.byte[3]);
-    Vehicle_data.speed = (Vehicle_data.speed_fl + Vehicle_data.speed_fr) / 2;
-    break;
-  }
-  /*case 0x777:{//m4_gear
-          Vehicle_data.gear				=
-  temp_message->data.byte[0]; break;
-  }*/
-  case 0x500: {
-    Vehicle_data.p_brake_front = temp_message->data.byte[1];
-    Vehicle_data.p_brake_rear = temp_message->data.byte[2];
-    break;
-  }
   }
 }
 
diff --git a/lib/FT_2018_STW_CAN/FT_2018_STW_CAN.h b/lib/FT_2018_STW_CAN/FT_2018_STW_CAN.h
index 23d65b4..3dcd8cb 100644
--- a/lib/FT_2018_STW_CAN/FT_2018_STW_CAN.h
+++ b/lib/FT_2018_STW_CAN/FT_2018_STW_CAN.h
@@ -2,10 +2,21 @@
 FT_2018_STW_CAN.h
 */
 
+#pragma once
+
 #include "Arduino.h"
 #include "DueTimer.h"
 #include "due_can.h"
 
+#define CAN_ID_BCU_APS_BRAKE 0x500
+#define CAN_ID_BCU_ETC 0x502
+#define CAN_ID_BCU_SHIFT_CTRL 0x504
+#define CAN_ID_BCU_LAP_TIME 0x570
+#define CAN_ID_MS4_IGN_REV_ATH 0x773
+#define CAN_ID_MS4_SPEED 0x775
+#define CAN_ID_MS4_ETC 0x779
+#define CAN_ID_MS4_STATES_TEMP_PRESS 0x77A
+
 void Init_Can_0();
 void Send_0x110();
 void Receive_Can_0(CAN_FRAME *frame);