diff --git a/bmw_e9x_e8x.dbc b/bmw_e9x_e8x.dbc
new file mode 100644
index 00000000000000..d8cfff3ea359fc
--- /dev/null
+++ b/bmw_e9x_e8x.dbc
@@ -0,0 +1,291 @@
+VERSION ""
+
+
+NS_ :
+    NS_DESC_
+    CM_
+    BA_DEF_
+    BA_
+    VAL_
+    CAT_DEF_
+    CAT_
+    FILTER
+    BA_DEF_DEF_
+    EV_DATA_
+    ENVVAR_DATA_
+    SGTYPE_
+    SGTYPE_VAL_
+    BA_DEF_SGTYPE_
+    BA_SGTYPE_
+    SIG_TYPE_REF_
+    VAL_TABLE_
+    SIG_GROUP_
+    SIG_VALTYPE_
+    SIGTYPE_VALTYPE_
+    BO_TX_BU_
+    BA_DEF_REL_
+    BA_REL_
+    BA_DEF_DEF_REL_
+    BU_SG_REL_
+    BU_EV_REL_
+    BU_BO_REL_
+    SG_MUL_VAL_
+
+BS_:
+
+BU_: XXX EON Vector__XXX
+
+
+BO_ 170 AccPedal: 8 XXX
+ SG_ KickDownPressed : 53|1@0+ (1,0) [0|3] "" XXX
+ SG_ CruisePedalActive : 54|1@0+ (1,0) [0|1] "" XXX
+ SG_ CruisePedalInactive : 55|1@0+ (1,0) [0|1] "" XXX
+ SG_ ThrottlelPressed : 50|1@0+ (1,0) [0|1] "" XXX
+ SG_ AcceleratorPedalPressed : 52|1@0+ (1,0) [0|7] "" XXX
+ SG_ AcceleratorPedalPercentage : 16|16@1+ (0.01,0) [0|100] "" XXX
+ SG_ Counter1 : 8|4@1+ (1,0) [0|15] "" XXX
+ SG_ EngineSpeed : 32|16@1- (1,0) [0|65535] "" XXX
+ SG_ uknown : 7|8@0- (1,0) [0|65535] "" XXX
+
+BO_ 404 CruiseControl: 4 XXX
+ SG_ plus1mph_request : 16|1@0+ (1,0) [0|1] "" XXX
+ SG_ minus1mph_request : 18|1@0+ (1,0) [0|1] "" XXX
+ SG_ Cancel_request_up_stalk : 23|1@0+ (1,0) [0|1] "" XXX
+ SG_ Cancel_request_up_or_down_stalk : 20|1@0+ (1,0) [0|1] "" XXX
+ SG_ Resume_request : 22|1@0+ (1,0) [0|1] "" XXX
+ SG_ Counter1 : 3|4@0+ (1,0) [0|15] "" XXX
+ SG_ Counter2 : 11|4@0+ (1,0) [0|15] "" XXX
+ SG_ notCancel_0xF : 7|4@0+ (1,0) [0|15] "" XXX
+ SG_ setMe_0xFC : 31|8@0+ (1,0) [0|255] "" XXX
+ SG_ requests_0xF : 15|4@0+ (1,0) [0|15] "" XXX
+ SG_ plus5mph_request : 17|1@0+ (1,0) [0|0] "" Vector__XXX
+ SG_ minus5mph_request : 19|1@0+ (1,0) [0|0] "" Vector__XXX
+
+BO_ 512 CruiseControlStatus: 8 XXX
+ SG_ CruiseControlInactiveFlag : 12|1@0+ (1,0) [0|1] "" XXX
+ SG_ CruiseCoontrolActiveFlag : 13|1@0+ (1,0) [0|1] "" XXX
+ SG_ CruiseControlSetpointSpeed : 7|8@0+ (0.25,0) [0|255] "mph" XXX
+
+BO_ 168 EngineAndBrake: 8 XXX
+ SG_ Brake_active2 : 62|1@0+ (1,0) [0|1] "" XXX
+ SG_ BrakePressed : 61|1@0+ (1,0) [0|1] "" XXX
+ SG_ EngineTorque : 8|16@1- (1,0) [0|65535] "" XXX
+ SG_ EngineTorqueWoInterv : 24|16@1- (1,0) [0|65535] "" XXX
+
+BO_ 470 SteeringButtons: 2 XXX
+ SG_ Volume_DOWN : 2|1@0+ (1,0) [0|1] "" XXX
+ SG_ Volume_UP : 3|1@0+ (1,0) [0|1] "" XXX
+ SG_ VoiceControl : 8|1@0+ (1,0) [0|1] "" XXX
+ SG_ Telephone : 0|1@0+ (1,0) [0|1] "" XXX
+ SG_ Next_up : 5|1@0+ (1,0) [0|1] "" XXX
+ SG_ Previous_down : 4|1@0+ (1,0) [0|1] "" XXX
+
+BO_ 403 DynamicCruiseControlStatus: 8 XXX
+ SG_ Counter : 7|8@0+ (1,0) [0|255] "" XXX
+ SG_ CruiseActive : 43|1@0+ (1,0) [0|1] "" XXX
+ SG_ CruiseSpeedChangeRequest : 48|1@0+ (1,0) [0|1] "" XXX
+ SG_ CruiseControlSetpointSpeed : 15|8@0+ (1,-2) [0|255] "mph" XXX
+
+BO_ 201 SteeringWheelAngle_DSC: 8 XXX
+ SG_ Counter1 : 23|4@0+ (1,0) [0|15] "" XXX
+ SG_ WeirdCounter : 44|4@1+ (1,0) [0|3] "" XXX
+ SG_ SteeringPositionComplementLow : 24|11@1- (1,0) [0|1] "" XXX
+ SG_ SteeringPosition : 0|16@1- (0.0439453125,0) [-600|600] "deg" XXX
+
+BO_ 206 WheelSpeeds: 8 XXX
+ SG_ Wheel1 : 0|16@1- (0.0643699,0) [0|255] "kph" XXX
+ SG_ Wheel2 : 16|16@1- (0.0643699,0) [0|255] "kph" XXX
+ SG_ Wheel4 : 48|16@1- (0.0643699,0) [0|255] "kph" XXX
+ SG_ Wheel3 : 32|16@1- (0.0643699,0) [0|255] "kph" XXX
+
+BO_ 884 WheelToleranceAdjustment: 8 XXX
+
+BO_ 678 WiperSwitch: 8 XXX
+ SG_ AutoWipersOn : 0|1@1+ (1,0) [0|3] "" XXX
+
+BO_ 304 TerminalStatus: 8 XXX
+ SG_ AccOn : 23|1@0+ (1,0) [0|255] "" XXX
+ SG_ IgnitionOff : 22|1@0+ (1,0) [0|3] "" XXX
+
+BO_ 169 Torque2: 8 XXX
+
+BO_ 184 TorqueTransmisionRequest: 8 XXX
+
+BO_ 196 SteeringWheelAngle: 7 XXX
+ SG_ SteeringPosition : 0|16@1- (0.0439453125,0) [-600|600] "degree" XXX
+ SG_ SteeringSpeed : 24|16@1- (0.0439453125,0) [0|255] "degree/s" XXX
+
+BO_ 180 WheelTorqueDriveTrain1: 8 XXX
+
+BO_ 182 DynamicCruiseControlTorqueDemand: 8 XXX
+
+BO_ 186 TransmissionData: 8 XXX
+
+BO_ 191 RequestedWheelTorqueDriveTrainActiveCruiseControl: 8 XXX
+ SG_ Counter : 11|4@0- (1,0) [0|255] "" XXX
+ SG_ TorqueReq : 16|11@1+ (1,0) [0|65535] "" XXX
+
+BO_ 414 Status_DSC: 8 XXX
+
+BO_ 416 Speed: 8 XXX
+ SG_ VehicleSpeed : 0|12@1+ (0.103,0) [0|255] "kph" XXX
+
+BO_ 418 TransimissionData2: 8 XXX
+
+BO_ 690 WheelPressure: 8 XXX
+
+BO_ 691 AccelerationData: 8 XXX
+
+BO_ 408 GearSelectorSwitch: 8 XXX
+ SG_ Gear : 0|8@1+ (1,0) [0|0] "" Vector__XXX
+
+BO_ 422 Distance: 8 XXX
+
+BO_ 436 InstrumentClusterStatus_KOMBI: 8 XXX
+
+BO_ 464 EngineData: 8 XXX
+
+BO_ 945 TransmissionData3: 8 XXX
+
+BO_ 200 SteeringWheelAngle_slow: 8 XXX
+ SG_ SteeringPosition : 0|16@1- (0.0439453125,0) [-600|600] "degree" XXX
+ SG_ SteeringSpeed : 24|16@1- (0.0439453125,0) [-65535|65535] "degree/s" XXX
+
+BO_ 466 TransmissionDataDisplay: 8 XXX
+
+BO_ 437 HeatFlow_LoadMomentClimate: 8 XXX
+
+BO_ 1152 NetworkManagment1: 8 XXX
+
+BO_ 1170 NetworkManagment2: 8 XXX
+
+BO_ 1175 NetworkManagment3: 8 XXX
+
+BO_ 1176 NetworkManagment4: 8 XXX
+
+BO_ 1193 NetworkManagment5: 8 XXX
+
+BO_ 1246 NetworkManagment6: 8 XXX
+
+BO_ 438 HeatFlowEngine: 8 XXX
+
+BO_ 784 AmbientTemperature: 8 XXX
+
+BO_ 821 ElectricFuelPumpStatus: 8 XXX
+
+BO_ 1007 EngineOBD_data: 8 XXX
+
+BO_ 1432 ServicesDKG: 8 XXX
+
+BO_ 309 CrashDisconnectControl: 8 XXX
+
+BO_ 502 TurnSignals: 2 XXX
+ SG_ TurnSignalIdle : 9|1@0+ (1,0) [0|1] "" XXX
+ SG_ TurnSignalActive : 8|1@0+ (1,0) [0|1] "" XXX
+ SG_ RightTurn : 5|1@0+ (1,0) [0|1] "" XXX
+ SG_ LeftTurn : 4|1@1+ (1,0) [0|1] "" XXX
+ SG_ HoldActivated : 0|1@1+ (1,0) [0|1] "" XXX
+
+BO_ 514 Dimming: 8 XXX
+
+BO_ 538 LampsCondition: 8 XXX
+
+BO_ 550 RainSensorWiperSpeed: 8 XXX
+
+BO_ 578 ClimateFrontStatus: 8 XXX
+
+BO_ 704 LCD_lighting: 8 XXX
+
+BO_ 758 LightControl: 8 XXX
+
+BO_ 760 Time_Date: 8 XXX
+
+BO_ 762 SeatBeltContact: 8 XXX
+
+BO_ 764 TrunkStatus: 8 XXX
+
+BO_ 797 TirePressureStatus: 8 XXX
+
+BO_ 816 Range_Mileage: 8 XXX
+
+BO_ 823 StatusFuelControl: 8 XXX
+
+BO_ 897 EngineOilLevelStatus: 8 XXX
+
+BO_ 940 Terminal30Eerror: 8 XXX
+
+BO_ 947 PowerManagmentConsumptionControl: 8 XXX
+
+BO_ 948 PowerBatteryVoltage: 8 XXX
+ SG_ BatteryVoltage : 7|24@0+ (0.001,0) [0|65535] "" XXX
+
+BO_ 958 PowerRunningTime: 8 XXX
+
+BO_ 1408 ServicesKGM: 8 XXX
+
+BO_ 1426 ServicesDME: 8 XXX
+
+BO_ 1449 ServicesDSC: 8 XXX
+
+BO_ 1504 ServicesKOMBI: 8 XXX
+
+BO_ 1522 ServicesKBM: 8 XXX
+
+BO_ 209 Accelerometer: 8 XXX
+ SG_ LateralAcceleration : 0|16@1- (1,0) [0|7] "" XXX
+ SG_ LongitudalAcceleration : 32|16@1- (1,0) [0|65535] "" XXX
+
+BO_ 172 WheelTorqueDrivetrain2: 8 XXX
+
+BO_ 128 Unknown80: 5 XXX
+ SG_ State2 : 24|4@1+ (1,0) [0|15] "" XXX
+ SG_ State1 : 23|8@0+ (1,0) [0|255] "" XXX
+ SG_ Counter1 : 31|4@0+ (1,0) [0|15] "" XXX
+
+BO_ 320 Unknown140: 2 XXX
+ SG_ State : 7|8@0+ (1,0) [0|255] "" XXX
+
+BO_ 212 Unknown_d4: 8 XXX
+ SG_ State1 : 47|8@0+ (1,0) [0|255] "" XXX
+ SG_ Counter1 : 55|8@0+ (1,0) [0|255] "" XXX
+ SG_ Counter2 : 63|8@0+ (1,0) [0|255] "" XXX
+
+BO_ 205 Unknown_cd: 8 XXX
+ SG_ NEW_SIGNAL_2 : 15|8@0+ (1,0) [0|255] "" XXX
+ SG_ NEW_SIGNAL_3 : 23|8@0+ (1,0) [0|255] "" XXX
+ SG_ NEW_SIGNAL_4 : 31|8@0+ (1,0) [0|255] "" XXX
+ SG_ NEW_SIGNAL_5 : 39|8@0- (1,0) [0|255] "" XXX
+ SG_ NEW_SIGNAL_6 : 47|8@0+ (1,0) [0|255] "" XXX
+ SG_ Counter1 : 55|4@0+ (1,0) [0|255] "" XXX
+ SG_ NEW_SIGNAL_1 : 7|8@0+ (1,0) [0|255] "" XXX
+ SG_ NEW_SIGNAL_7 : 63|8@0- (1,0) [0|255] "" XXX
+
+BO_ 1577 NEW_MSG_1: 8 XXX
+
+
+
+
+CM_ SG_ 170 ThrottlelPressed "Active when accelerator pedal pressed or cruise control drives";
+CM_ SG_ 170 AcceleratorPedalPressed "Active only when driver actually presses the pedal";
+CM_ SG_ 170 AcceleratorPedalPercentage "ToDo Factor to be adjusted";
+CM_ SG_ 170 EngineSpeed "It's hard to say that is even a rate";
+CM_ SG_ 404 plus1mph_request "Appears when +1mph/kph stalk is depressed";
+CM_ SG_ 404 minus1mph_request "Appears when -1mph/kph stalk is depressed";
+CM_ SG_ 404 Cancel_request_up_stalk "Appears when cancel stalk (up) is depressed";
+CM_ SG_ 404 Cancel_request_up_or_down_stalk "Appears when cancel stalk (up or down) is depressed";
+CM_ SG_ 404 Resume_request "It appears when resume stalk button is depressed";
+CM_ SG_ 404 Counter1 "It accelerates when requests are being sent";
+CM_ SG_ 404 Counter2 "It accelerates when requests are being sent";
+CM_ SG_ 404 notCancel_0xF "0xF unless cancel is requested then 0x0";
+CM_ SG_ 168 Brake_active2 "";
+CM_ SG_ 168 BrakePressed "Brake when driver presses the brake";
+CM_ SG_ 168 EngineTorque "Engine torque without inertia - combustion torque";
+CM_ SG_ 168 EngineTorqueWoInterv "Engine torque without inertia and without shift intervention";
+CM_ SG_ 403 CruiseControlSetpointSpeed "Speed target";
+CM_ SG_ 408 Gear "This is just provision, needs to be reverse engineered";
+CM_ SG_ 502 TurnSignalIdle "Turn signal off";
+CM_ SG_ 502 TurnSignalActive "Turn signal on or transitioning";
+CM_ SG_ 502 RightTurn "Indicates right blinker or when steering returning right clears left blinker";
+CM_ SG_ 502 LeftTurn "Indicates left blinker or when steering returning left clears right blinker";
+CM_ SG_ 502 HoldActivated "Spikes down if blinker cleared with timeout or turn. Stays off if blinker cleared with stalk";
+VAL_ 408 Gear 1 "D" 2 "S" 3 "N" 4 "R" 5 "P" ;
diff --git a/can/common.cc b/can/common.cc
index 5c7efe4ed27341..3fec5c4bb67c3c 100644
--- a/can/common.cc
+++ b/can/common.cc
@@ -106,6 +106,9 @@ unsigned int volkswagen_crc(unsigned int address, uint64_t d, int l) {
     case 0x30C: // ACC_02 Automatic Cruise Control
       crc ^= (uint8_t[]){0x0F,0x0F,0x0F,0x0F,0x0F,0x0F,0x0F,0x0F,0x0F,0x0F,0x0F,0x0F,0x0F,0x0F,0x0F,0x0F}[counter];
       break;
+    case 0x30F: // SWA_01 Lane Change Assist (SpurWechselAssistent)
+      crc ^= (uint8_t[]){0x0C,0x0C,0x0C,0x0C,0x0C,0x0C,0x0C,0x0C,0x0C,0x0C,0x0C,0x0C,0x0C,0x0C,0x0C,0x0C}[counter];
+      break;
     case 0x3C0: // Klemmen_Status_01 ignition and starting status
       crc ^= (uint8_t[]){0xC3,0xC3,0xC3,0xC3,0xC3,0xC3,0xC3,0xC3,0xC3,0xC3,0xC3,0xC3,0xC3,0xC3,0xC3,0xC3}[counter];
       break;
diff --git a/generator/toyota/_toyota_2017.dbc b/generator/toyota/_toyota_2017.dbc
index 3ad15b80556732..54f4491edf9e47 100644
--- a/generator/toyota/_toyota_2017.dbc
+++ b/generator/toyota/_toyota_2017.dbc
@@ -62,7 +62,10 @@ BO_ 180 SPEED: 8 XXX
 
 BO_ 353 DSU_SPEED: 8 XXX
  SG_ FORWARD_SPEED : 15|16@0- (0.00390625,-30) [0|255] "kph" XXX
-
+ 
+BO_ 452 ENGINE_RPM: 8 CGW
+ SG_ RPM : 7|16@0- (0.78125,0) [0|0] "rpm" SCS
+ 
 BO_ 466 PCM_CRUISE: 8 XXX
  SG_ GAS_RELEASED : 4|1@0+ (1,0) [0|1] "" XXX
  SG_ CRUISE_ACTIVE : 5|1@0+ (1,0) [0|1] "" XXX
diff --git a/lexus_ct200h_2018_pt_generated.dbc b/lexus_ct200h_2018_pt_generated.dbc
index 8c90eecb10ddcd..c16f02ea5c6d5d 100644
--- a/lexus_ct200h_2018_pt_generated.dbc
+++ b/lexus_ct200h_2018_pt_generated.dbc
@@ -96,7 +96,10 @@ BO_ 180 SPEED: 8 XXX
 
 BO_ 353 DSU_SPEED: 8 XXX
  SG_ FORWARD_SPEED : 15|16@0- (0.00390625,-30) [0|255] "kph" XXX
-
+ 
+BO_ 452 ENGINE_RPM: 8 CGW
+ SG_ RPM : 7|16@0- (0.78125,0) [0|0] "rpm" SCS
+ 
 BO_ 466 PCM_CRUISE: 8 XXX
  SG_ GAS_RELEASED : 4|1@0+ (1,0) [0|1] "" XXX
  SG_ CRUISE_ACTIVE : 5|1@0+ (1,0) [0|1] "" XXX
diff --git a/lexus_gs300h_2017_pt_generated.dbc b/lexus_gs300h_2017_pt_generated.dbc
index ddb29c425696fa..07c93fb11b6605 100644
--- a/lexus_gs300h_2017_pt_generated.dbc
+++ b/lexus_gs300h_2017_pt_generated.dbc
@@ -96,7 +96,10 @@ BO_ 180 SPEED: 8 XXX
 
 BO_ 353 DSU_SPEED: 8 XXX
  SG_ FORWARD_SPEED : 15|16@0- (0.00390625,-30) [0|255] "kph" XXX
-
+ 
+BO_ 452 ENGINE_RPM: 8 CGW
+ SG_ RPM : 7|16@0- (0.78125,0) [0|0] "rpm" SCS
+ 
 BO_ 466 PCM_CRUISE: 8 XXX
  SG_ GAS_RELEASED : 4|1@0+ (1,0) [0|1] "" XXX
  SG_ CRUISE_ACTIVE : 5|1@0+ (1,0) [0|1] "" XXX
diff --git a/lexus_is_2018_pt_generated.dbc b/lexus_is_2018_pt_generated.dbc
index 0b1f5315e40e09..a8131a76df1228 100644
--- a/lexus_is_2018_pt_generated.dbc
+++ b/lexus_is_2018_pt_generated.dbc
@@ -96,7 +96,10 @@ BO_ 180 SPEED: 8 XXX
 
 BO_ 353 DSU_SPEED: 8 XXX
  SG_ FORWARD_SPEED : 15|16@0- (0.00390625,-30) [0|255] "kph" XXX
-
+ 
+BO_ 452 ENGINE_RPM: 8 CGW
+ SG_ RPM : 7|16@0- (0.78125,0) [0|0] "rpm" SCS
+ 
 BO_ 466 PCM_CRUISE: 8 XXX
  SG_ GAS_RELEASED : 4|1@0+ (1,0) [0|1] "" XXX
  SG_ CRUISE_ACTIVE : 5|1@0+ (1,0) [0|1] "" XXX
diff --git a/lexus_nx300h_2018_pt_generated.dbc b/lexus_nx300h_2018_pt_generated.dbc
index d9826a8f925c0c..ddb3b081ee08b3 100644
--- a/lexus_nx300h_2018_pt_generated.dbc
+++ b/lexus_nx300h_2018_pt_generated.dbc
@@ -96,7 +96,10 @@ BO_ 180 SPEED: 8 XXX
 
 BO_ 353 DSU_SPEED: 8 XXX
  SG_ FORWARD_SPEED : 15|16@0- (0.00390625,-30) [0|255] "kph" XXX
-
+ 
+BO_ 452 ENGINE_RPM: 8 CGW
+ SG_ RPM : 7|16@0- (0.78125,0) [0|0] "rpm" SCS
+ 
 BO_ 466 PCM_CRUISE: 8 XXX
  SG_ GAS_RELEASED : 4|1@0+ (1,0) [0|1] "" XXX
  SG_ CRUISE_ACTIVE : 5|1@0+ (1,0) [0|1] "" XXX
diff --git a/lexus_rx_350_2016_pt_generated.dbc b/lexus_rx_350_2016_pt_generated.dbc
index 455cb41f344b01..8085713a34cd4c 100644
--- a/lexus_rx_350_2016_pt_generated.dbc
+++ b/lexus_rx_350_2016_pt_generated.dbc
@@ -96,7 +96,10 @@ BO_ 180 SPEED: 8 XXX
 
 BO_ 353 DSU_SPEED: 8 XXX
  SG_ FORWARD_SPEED : 15|16@0- (0.00390625,-30) [0|255] "kph" XXX
-
+ 
+BO_ 452 ENGINE_RPM: 8 CGW
+ SG_ RPM : 7|16@0- (0.78125,0) [0|0] "rpm" SCS
+ 
 BO_ 466 PCM_CRUISE: 8 XXX
  SG_ GAS_RELEASED : 4|1@0+ (1,0) [0|1] "" XXX
  SG_ CRUISE_ACTIVE : 5|1@0+ (1,0) [0|1] "" XXX
diff --git a/lexus_rx_hybrid_2017_pt_generated.dbc b/lexus_rx_hybrid_2017_pt_generated.dbc
index 76c43fed924309..d7b51c933ddc98 100644
--- a/lexus_rx_hybrid_2017_pt_generated.dbc
+++ b/lexus_rx_hybrid_2017_pt_generated.dbc
@@ -96,7 +96,10 @@ BO_ 180 SPEED: 8 XXX
 
 BO_ 353 DSU_SPEED: 8 XXX
  SG_ FORWARD_SPEED : 15|16@0- (0.00390625,-30) [0|255] "kph" XXX
-
+ 
+BO_ 452 ENGINE_RPM: 8 CGW
+ SG_ RPM : 7|16@0- (0.78125,0) [0|0] "rpm" SCS
+ 
 BO_ 466 PCM_CRUISE: 8 XXX
  SG_ GAS_RELEASED : 4|1@0+ (1,0) [0|1] "" XXX
  SG_ CRUISE_ACTIVE : 5|1@0+ (1,0) [0|1] "" XXX
diff --git a/mazda_3_2019.dbc b/mazda_3_2019.dbc
new file mode 100644
index 00000000000000..2026e71517ed11
--- /dev/null
+++ b/mazda_3_2019.dbc
@@ -0,0 +1,308 @@
+VERSION ""
+
+
+NS_ :
+    NS_DESC_
+    CM_
+    BA_DEF_
+    BA_
+    VAL_
+    CAT_DEF_
+    CAT_
+    FILTER
+    BA_DEF_DEF_
+    EV_DATA_
+    ENVVAR_DATA_
+    SGTYPE_
+    SGTYPE_VAL_
+    BA_DEF_SGTYPE_
+    BA_SGTYPE_
+    SIG_TYPE_REF_
+    VAL_TABLE_
+    SIG_GROUP_
+    SIG_VALTYPE_
+    SIGTYPE_VALTYPE_
+    BO_TX_BU_
+    BA_DEF_REL_
+    BA_REL_
+    BA_DEF_DEF_REL_
+    BU_SG_REL_
+    BU_EV_REL_
+    BU_BO_REL_
+    SG_MUL_VAL_
+
+BS_:
+
+BU_: XXX
+
+
+BO_ 256 CAM_Start: 8 XXX
+ SG_ NEW_SIGNAL_1 : 15|8@0+ (1,0) [0|255] "" XXX
+ SG_ NEW_SIGNAL_3 : 20|12@0+ (1,0) [0|7] "" XXX
+ SG_ NEW_SIGNAL_5 : 24|13@0+ (1,0) [0|255] "" XXX
+ SG_ NEW_SIGNAL_7 : 56|4@1+ (1,0) [0|15] "" XXX
+ SG_ NEW_SIGNAL_8 : 61|2@0+ (1,0) [0|15] "" XXX
+ SG_ NEW_SIGNAL_10 : 43|12@0+ (1,0) [0|15] "" XXX
+ SG_ NEW_SIGNAL_6 : 7|8@0+ (1,0) [0|255] "" XXX
+ SG_ NEW_SIGNAL_2 : 63|2@0+ (1,0) [0|3] "" XXX
+ SG_ NEW_SIGNAL_4 : 23|3@0+ (1,0) [0|15] "" XXX
+
+BO_ 358 CAM_End: 8 XXX
+ SG_ NEW_SIGNAL_2 : 61|2@0+ (1,0) [0|3] "" XXX
+ SG_ NEW_SIGNAL_3 : 59|4@0+ (1,0) [0|15] "" XXX
+ SG_ NEW_SIGNAL_1 : 7|32@0+ (1,0) [0|255] "" XXX
+
+BO_ 1216 CAM_69: 8 XXX
+ SG_ NEW_SIGNAL_1 : 56|4@1+ (1,0) [0|15] "" XXX
+ SG_ NEW_SIGNAL_2 : 7|16@0+ (1,0) [0|65535] "" XXX
+ SG_ NEW_SIGNAL_3 : 23|16@0+ (1,0) [0|65535] "" XXX
+ SG_ NEW_SIGNAL_4 : 39|16@0+ (1,0) [0|65535] "" XXX
+ SG_ NEW_SIGNAL_5 : 55|12@0+ (1,0) [0|7] "" XXX
+
+BO_ 1120 CAM_KEEP_ALIVE_2: 8 XXX
+ SG_ NEW_SIGNAL_1 : 7|16@0+ (1,0) [0|65535] "" XXX
+ SG_ NEW_SIGNAL_2 : 23|16@0+ (1,0) [0|65535] "" XXX
+ SG_ NEW_SIGNAL_3 : 39|16@0+ (1,0) [0|65535] "" XXX
+ SG_ NEW_SIGNAL_4 : 55|16@0+ (1,0) [0|65535] "" XXX
+
+BO_ 1436 CAM_71: 8 XXX
+ SG_ NEW_SIGNAL_1 : 7|16@0+ (1,0) [0|255] "" XXX
+ SG_ NEW_SIGNAL_2 : 23|16@0+ (1,0) [0|65535] "" XXX
+ SG_ NEW_SIGNAL_3 : 39|16@0+ (1,0) [0|65535] "" XXX
+ SG_ NEW_SIGNAL_4 : 55|16@0+ (1,0) [0|65535] "" XXX
+
+BO_ 18 STEER: 8 XXX
+ SG_ NEW_SIGNAL_5 : 42|1@0+ (1,0) [0|63] "" XXX
+ SG_ NEW_SIGNAL_6 : 63|4@0+ (1,0) [0|3] "" XXX
+ SG_ NEW_SIGNAL_3 : 55|4@0+ (1,0) [0|15] "" XXX
+ SG_ NEW_SIGNAL_1 : 59|4@0+ (1,0) [0|255] "" XXX
+ SG_ NEW_SIGNAL_2 : 51|4@0+ (1,0) [0|15] "" XXX
+ SG_ CTR : 41|2@0+ (1,0) [0|3] "" XXX
+ SG_ STEER_ANGLE : 26|16@0+ (0.05,-1600) [-500|500] "" XXX
+
+BO_ 257 LKAS: 8 XXX
+ SG_ CTR : 59|4@0+ (1,0) [0|255] "" XXX
+ SG_ CTR_ACT : 61|2@0+ (1,0) [0|3] "" XXX
+ SG_ LEAD_DIST : 0|12@0+ (1,0) [0|255] "" XXX
+ SG_ SET_19 : 7|7@0+ (1,0) [0|255] "" XXX
+ SG_ SET_0 : 48|3@1+ (1,0) [0|3] "" XXX
+ SG_ SET_0_1 : 63|2@0+ (1,0) [0|3] "" XXX
+ SG_ UNKNOWN : 24|11@0+ (1,0) [0|4095] "" XXX
+ SG_ MAX_TORQUE__ : 45|11@0+ (-1,1000) [0|4095] "" XXX
+ SG_ ANGLE_TARGET : 20|12@0+ (0.1,-200) [0|4095] "" XXX
+
+BO_ 258 NEW_MSG_3: 8 XXX
+ SG_ NEW_SIGNAL_2 : 16|8@1+ (1,0) [0|255] "" XXX
+ SG_ NEW_SIGNAL_1 : 8|8@1+ (1,0) [0|255] "" XXX
+
+BO_ 28 WHEEL_SPEEDS: 8 XXX
+ SG_ RR : 55|16@0+ (0.01,-100) [0|65535] "" XXX
+ SG_ RL : 39|16@0+ (0.01,-102) [0|65535] "" XXX
+ SG_ FL : 7|16@0+ (0.01,-100) [0|65535] "" XXX
+ SG_ FR : 23|16@0+ (0.01,-100) [0|65535] "" XXX
+
+BO_ 259 NEW_MSG_5: 8 XXX
+ SG_ NEW_SIGNAL_1 : 15|8@0+ (1,0) [0|255] "" XXX
+
+BO_ 260 NEW_MSG_6: 8 XXX
+ SG_ NEW_SIGNAL_1 : 15|8@0+ (1,0) [0|255] "" XXX
+
+BO_ 261 NEW_MSG_7: 8 XXX
+ SG_ NEW_SIGNAL_1 : 15|8@0+ (1,0) [0|255] "" XXX
+
+BO_ 262 NEW_MSG_8: 8 XXX
+ SG_ NEW_SIGNAL_1 : 15|8@0+ (1,0) [0|255] "" XXX
+
+BO_ 263 NEW_MSG_9: 8 XXX
+ SG_ NEW_SIGNAL_1 : 15|8@0+ (1,0) [0|255] "" XXX
+
+BO_ 310 NEW_MSG_10: 8 XXX
+ SG_ NEW_SIGNAL_1 : 56|4@1+ (1,0) [0|255] "" XXX
+ SG_ NEW_SIGNAL_2 : 15|8@0+ (1,0) [0|255] "" XXX
+ SG_ NEW_SIGNAL_3 : 61|2@0+ (1,0) [0|3] "" XXX
+
+BO_ 308 NEW_MSG_11: 8 XXX
+ SG_ NEW_SIGNAL_1 : 63|8@0+ (1,0) [0|255] "" XXX
+ SG_ NEW_SIGNAL_2 : 15|8@0+ (1,0) [0|255] "" XXX
+ SG_ NEW_SIGNAL_3 : 48|8@1+ (1,0) [0|15] "" XXX
+ SG_ NEW_SIGNAL_4 : 19|8@0+ (1,0) [0|15] "" XXX
+
+BO_ 304 NEW_MSG_12: 8 XXX
+ SG_ NEW_SIGNAL_1 : 15|8@0+ (1,0) [0|255] "" XXX
+ SG_ NEW_SIGNAL_3 : 59|4@0+ (1,0) [0|255] "" XXX
+ SG_ NEW_SIGNAL_4 : 61|2@0+ (1,0) [0|3] "" XXX
+ SG_ NEW_SIGNAL_5 : 23|12@0+ (1,0) [0|2047] "" XXX
+ SG_ NEW_SIGNAL_6 : 27|8@0+ (1,0) [0|4095] "" XXX
+ SG_ NEW_SIGNAL_7 : 27|4@0+ (1,0) [0|15] "" XXX
+ SG_ NEW_SIGNAL_2 : 35|6@0+ (1,0) [0|15] "" XXX
+ SG_ NEW_SIGNAL_8 : 0|8@1+ (1,0) [0|255] "" XXX
+
+BO_ 305 NEW_MSG_13: 8 XXX
+ SG_ NEW_SIGNAL_1 : 3|12@0+ (1,0) [0|255] "" XXX
+ SG_ NEW_SIGNAL_2 : 23|12@0+ (1,0) [0|4095] "" XXX
+ SG_ NEW_SIGNAL_3 : 27|14@0+ (1,0) [0|15] "" XXX
+ SG_ NEW_SIGNAL_5 : 56|4@1+ (1,0) [0|15] "" XXX
+ SG_ NEW_SIGNAL_6 : 61|2@0+ (1,0) [0|3] "" XXX
+
+BO_ 352 NEW_MSG_14: 8 XXX
+ SG_ NEW_SIGNAL_1 : 7|16@0+ (1,0) [0|255] "" XXX
+ SG_ NEW_SIGNAL_2 : 23|16@0+ (1,0) [0|65535] "" XXX
+ SG_ NEW_SIGNAL_3 : 39|16@0+ (1,0) [0|65535] "" XXX
+ SG_ NEW_SIGNAL_4 : 55|16@0+ (1,0) [0|65535] "" XXX
+
+BO_ 355 NEW_MSG_15: 8 XXX
+ SG_ NEW_SIGNAL_1 : 7|8@0+ (1,0) [0|127] "" XXX
+
+BO_ 356 NEW_MSG_16: 8 XXX
+ SG_ NEW_SIGNAL_1 : 56|4@1+ (1,0) [0|15] "" XXX
+ SG_ NEW_SIGNAL_2 : 61|2@0+ (1,0) [0|3] "" XXX
+
+BO_ 357 NEW_MSG_17: 8 XXX
+ SG_ NEW_SIGNAL_1 : 61|2@0+ (1,0) [0|3] "" XXX
+ SG_ NEW_SIGNAL_2 : 7|32@0+ (1,0) [0|4294967295] "" XXX
+ SG_ NEW_SIGNAL_3 : 56|4@1+ (1,0) [0|15] "" XXX
+
+BO_ 59 STEER_RATE: 8 XXX
+ SG_ NEW_SIGNAL_2 : 47|4@0+ (1,0) [0|15] "" XXX
+ SG_ STEER_ANGLE_RATE : 55|16@0+ (0.05,0) [0|65535] "" XXX
+ SG_ NEW_SIGNAL_1 : 43|4@0+ (1,0) [0|15] "" XXX
+ SG_ STEER_ANGLE : 23|16@0+ (0.05,-1600) [-500|500] "" XXX
+ SG_ CHKSUM : 39|8@0+ (1,0) [0|15] "" XXX
+
+BO_ 24 NEW_MSG_1: 8 XXX
+ SG_ NEW_SIGNAL_3 : 15|1@0+ (1,0) [0|7] "" XXX
+ SG_ NEW_SIGNAL_2 : 7|1@0+ (1,0) [0|65535] "" XXX
+ SG_ NEW_SIGNAL_1 : 6|1@0+ (1,0) [0|3] "" XXX
+ SG_ NEW_SIGNAL_5 : 0|1@0+ (1,0) [0|3] "" XXX
+
+BO_ 26 ENGINE_DATA: 8 XXX
+ SG_ NEW_SIGNAL_3 : 55|4@0+ (1,0) [0|15] "" XXX
+ SG_ PEDAL_GAS : 39|12@0+ (1,0) [0|15] "" XXX
+ SG_ CHKSUM : 63|8@0- (1,0) [0|15] "" XXX
+ SG_ RPM : 7|13@0+ (1,0) [0|15] "" XXX
+ SG_ NEW_SIGNAL_1 : 10|19@0+ (1,0) [0|524287] "" XXX
+ SG_ NEW_SIGNAL_4 : 43|4@0+ (1,0) [0|255] "" XXX
+ SG_ NEW_SIGNAL_2 : 51|4@0+ (1,0) [0|15] "" XXX
+
+BO_ 145 BLINK_INFO: 8 XXX
+ SG_ RIGHT_BLINK : 12|1@0+ (1,0) [0|3] "" XXX
+ SG_ LEFT_BLINK : 13|1@0+ (1,0) [0|3] "" XXX
+ SG_ Speed : 27|12@0+ (1,0) [0|255] "" XXX
+ SG_ CTR : 51|4@0+ (1,0) [0|15] "" XXX
+ SG_ CHKSUM : 63|8@0+ (1,0) [0|15] "" XXX
+
+BO_ 16 STEER_TORQUE: 8 XXX
+ SG_ NEW_SIGNAL_12 : 7|2@0+ (1,0) [0|15] "" XXX
+ SG_ NEW_SIGNAL_7 : 27|4@0+ (1,0) [0|255] "" XXX
+ SG_ NEW_SIGNAL_6 : 39|8@0+ (1,0) [0|15] "" XXX
+ SG_ NEW_SIGNAL_1 : 43|4@0+ (1,0) [0|15] "" XXX
+ SG_ NEW_SIGNAL_5 : 47|4@0+ (1,0) [0|15] "" XXX
+ SG_ NEW_SIGNAL_3 : 51|4@0+ (1,0) [0|15] "" XXX
+ SG_ NEW_SIGNAL_4 : 55|4@0+ (1,0) [0|15] "" XXX
+ SG_ CHKSUM : 63|8@0+ (1,0) [0|15] "" XXX
+ SG_ STEER_TORQUE_MOTOR : 8|13@0+ (0.05,-205) [0|15] "" XXX
+ SG_ STEER_TORQUE_SENSOR : 5|13@0+ (1,-4000) [0|15] "" XXX
+
+BO_ 17 STEER_TORQUE_2: 8 XXX
+ SG_ CTR : 51|4@0+ (1,0) [0|15] "" XXX
+ SG_ NEW_SIGNAL_5 : 55|4@0+ (1,0) [0|15] "" XXX
+ SG_ CHKSUM : 63|8@0+ (1,0) [0|255] "" XXX
+ SG_ STEER_TORQUE_MOTOR : 7|16@0+ (1,0) [0|255] "" XXX
+ SG_ NEW_SIGNAL_1 : 27|16@0+ (1,0) [0|255] "" XXX
+ SG_ NEW_SIGNAL_2 : 43|4@0+ (1,0) [0|15] "" XXX
+
+BO_ 29 WHEEL: 8 XXX
+ SG_ STANDSTILL : 52|1@0+ (1,0) [0|15] "" XXX
+ SG_ SPEED : 39|16@0+ (1,0) [0|127] "" XXX
+ SG_ ENCODER_1 : 7|16@0+ (1,0) [0|65535] "" XXX
+ SG_ ENCODER_2 : 23|16@0+ (1,0) [0|65535] "" XXX
+ SG_ NEW_SIGNAL_6 : 55|3@0+ (1,0) [0|7] "" XXX
+ SG_ NEW_SIGNAL_1 : 63|8@0+ (1,0) [0|255] "" XXX
+ SG_ NEW_SIGNAL_2 : 51|4@0+ (1,0) [0|15] "" XXX
+
+BO_ 31 NEW_MSG_4: 8 XXX
+ SG_ NEW_SIGNAL_1 : 7|16@0+ (1,0) [0|65535] "" XXX
+ SG_ NEW_SIGNAL_2 : 23|16@0+ (1,0) [0|65535] "" XXX
+ SG_ NEW_SIGNAL_3 : 39|16@0+ (1,0) [0|65535] "" XXX
+ SG_ NEW_SIGNAL_4 : 55|16@0+ (1,0) [0|65535] "" XXX
+
+BO_ 96 STEER2: 8 XXX
+ SG_ NEW_SIGNAL_3 : 23|4@0+ (1,0) [0|15] "" XXX
+ SG_ SPEED : 19|20@0+ (1,0) [0|65535] "" XXX
+ SG_ NEW_SIGNAL_4 : 47|8@0+ (1,0) [0|15] "" XXX
+ SG_ NEW_SIGNAL_5 : 48|4@1+ (1,0) [0|15] "" XXX
+ SG_ CTR : 55|4@0+ (1,0) [0|15] "" XXX
+ SG_ CHKSUM : 63|8@0+ (1,0) [0|255] "" XXX
+ SG_ STEER__ : 7|16@0+ (1,0) [0|255] "" XXX
+
+BO_ 1209 KEEP_ALIVE_1: 8 XXX
+ SG_ NEW_SIGNAL_1 : 63|8@0+ (1,0) [0|255] "" XXX
+ SG_ NEW_SIGNAL_2 : 55|8@0+ (1,0) [0|255] "" XXX
+ SG_ NEW_SIGNAL_3 : 47|8@0+ (1,0) [0|255] "" XXX
+ SG_ NEW_SIGNAL_5 : 31|8@0+ (1,0) [0|255] "" XXX
+ SG_ NEW_SIGNAL_6 : 23|8@0+ (1,0) [0|255] "" XXX
+ SG_ NEW_SIGNAL_7 : 15|8@0+ (1,0) [0|255] "" XXX
+ SG_ NEW_SIGNAL_4 : 39|8@0+ (1,0) [0|255] "" XXX
+ SG_ NEW_SIGNAL_8 : 4|5@0+ (1,0) [0|127] "" XXX
+
+BO_ 37 BLANK_1: 8 XXX
+ SG_ NEW_SIGNAL_1 : 7|16@0+ (1,0) [0|65535] "" XXX
+ SG_ NEW_SIGNAL_2 : 23|16@0+ (1,0) [0|65535] "" XXX
+ SG_ NEW_SIGNAL_3 : 39|16@0+ (1,0) [0|65535] "" XXX
+ SG_ NEW_SIGNAL_4 : 55|16@0+ (1,0) [0|65535] "" XXX
+
+BO_ 44 BLANK_2: 8 XXX
+ SG_ NEW_SIGNAL_1 : 7|16@0+ (1,0) [0|16777215] "" XXX
+ SG_ NEW_SIGNAL_3 : 55|16@0+ (1,0) [0|65535] "" XXX
+ SG_ NEW_SIGNAL_4 : 23|16@0+ (1,0) [0|65535] "" XXX
+ SG_ NEW_SIGNAL_2 : 39|16@0+ (1,0) [0|16777215] "" XXX
+
+BO_ 128 NEW_MSG_18: 8 XXX
+ SG_ NEW_SIGNAL_1 : 59|4@0+ (1,0) [0|255] "" XXX
+ SG_ NEW_SIGNAL_2 : 23|8@0+ (1,0) [0|255] "" XXX
+ SG_ NEW_SIGNAL_3 : 7|8@0+ (1,0) [0|255] "" XXX
+ SG_ NEW_SIGNAL_4 : 15|8@0+ (1,0) [0|255] "" XXX
+
+BO_ 129 NEW_MSG_19: 8 XXX
+ SG_ NEW_SIGNAL_2 : 7|12@0+ (1,0) [0|65535] "" XXX
+ SG_ NEW_SIGNAL_3 : 31|16@0+ (1,0) [0|65535] "" XXX
+ SG_ NEW_SIGNAL_4 : 47|16@0+ (1,0) [0|65535] "" XXX
+ SG_ NEW_SIGNAL_5 : 56|8@1+ (1,0) [0|15] "" XXX
+
+BO_ 1034 KEEP_ALIVE_2: 8 XXX
+ SG_ NEW_SIGNAL_1 : 7|16@0+ (1,0) [0|255] "" XXX
+ SG_ NEW_SIGNAL_3 : 23|16@0+ (1,0) [0|255] "" XXX
+ SG_ NEW_SIGNAL_4 : 39|16@0+ (1,0) [0|255] "" XXX
+ SG_ NEW_SIGNAL_5 : 55|16@0+ (1,0) [0|255] "" XXX
+
+BO_ 1200 KEEP_ALIVE_3: 8 XXX
+ SG_ NEW_SIGNAL_1 : 7|16@0+ (1,0) [0|255] "" XXX
+ SG_ NEW_SIGNAL_2 : 55|16@0+ (1,0) [0|255] "" XXX
+ SG_ NEW_SIGNAL_3 : 23|16@0+ (1,0) [0|65535] "" XXX
+ SG_ NEW_SIGNAL_4 : 39|16@0+ (1,0) [0|65535] "" XXX
+
+BO_ 354 CAM_KEEP_ALIVE_1: 8 XXX
+ SG_ NEW_SIGNAL_1 : 7|16@0+ (1,0) [0|65535] "" XXX
+ SG_ NEW_SIGNAL_2 : 23|16@0+ (1,0) [0|65535] "" XXX
+ SG_ NEW_SIGNAL_3 : 39|16@0+ (1,0) [0|65535] "" XXX
+ SG_ NEW_SIGNAL_4 : 55|30@0+ (1,0) [0|65535] "" XXX
+
+BO_ 336 NEW_MSG_20: 8 XXX
+ SG_ NEW_SIGNAL_2 : 7|8@0+ (1,0) [0|4095] "" XXX
+ SG_ NEW_SIGNAL_1 : 11|12@0+ (1,0) [0|127] "" XXX
+ SG_ NEW_SIGNAL_3 : 31|8@0+ (1,0) [0|255] "" XXX
+ SG_ NEW_SIGNAL_4 : 39|8@0+ (1,0) [0|255] "" XXX
+ SG_ NEW_SIGNAL_5 : 47|8@0+ (1,0) [0|255] "" XXX
+
+BO_ 342 NEW_MSG_21: 8 XXX
+ SG_ NEW_SIGNAL_1 : 56|4@1+ (1,0) [0|15] "" XXX
+ SG_ NEW_SIGNAL_2 : 63|4@0+ (1,0) [0|15] "" XXX
+ SG_ NEW_SIGNAL_4 : 55|4@0+ (1,0) [0|15] "" XXX
+ SG_ NEW_SIGNAL_5 : 39|16@0+ (1,0) [0|15] "" XXX
+ SG_ NEW_SIGNAL_3 : 48|4@1+ (1,0) [0|15] "" XXX
+ SG_ NEW_SIGNAL_7 : 7|16@0+ (1,0) [0|255] "" XXX
+ SG_ NEW_SIGNAL_8 : 23|16@0+ (1,0) [0|65535] "" XXX
+ SG_ NEW_SIGNAL_6 : 40|4@1+ (1,0) [0|15] "" XXX
+
+BO_ 264 NEW_MSG_2: 8 XXX
+ SG_ NEW_SIGNAL_1 : 56|8@1+ (1,0) [0|15] "" XXX
diff --git a/mazda_cx5_gt_2017.dbc b/mazda_cx5_gt_2017.dbc
index 971b136118d2bf..92bb2f17090014 100644
--- a/mazda_cx5_gt_2017.dbc
+++ b/mazda_cx5_gt_2017.dbc
@@ -51,10 +51,10 @@ BO_ 118 RPM_RELATED: 8 XXX
  SG_ NEW_SIGNAL_2 : 19|12@0+ (1,0) [0|4095] "" XXX
 
 BO_ 514 ENGINE_DATA: 8 XXX
- SG_ PEDAL_GAS : 39|12@0+ (0.002778,0) [0|255] "%" XXX
  SG_ CHKSUM : 63|8@0+ (1,0) [0|127] "" XXX
  SG_ RPM : 7|16@0+ (0.25,0) [0|8500] "rpm" XXX
  SG_ SPEED : 23|16@0+ (0.01,0) [0|32767] "kph" XXX
+ SG_ PEDAL_GAS : 39|12@0+ (1,0) [0|255] "%" XXX
 
 BO_ 357 PEDALS: 8 XXX
  SG_ NEW_SIGNAL_6 : 31|4@0+ (1,0) [0|1] "" XXX
@@ -64,11 +64,11 @@ BO_ 357 PEDALS: 8 XXX
  SG_ CHKSUM : 63|8@0+ (1,0) [0|15] "" XXX
  SG_ STANDSTILL : 26|1@0+ (1,0) [0|16777215] "" XXX
  SG_ NEW_SIGNAL_3 : 23|8@0+ (1,0) [0|3] "" XXX
- SG_ GEAR : 48|5@1+ (1,0) [0|255] "" XXX
  SG_ BRAKE_ON : 4|1@0+ (1,0) [0|1] "" XXX
  SG_ NO_BRAKE : 6|1@0+ (1,0) [0|7] "" XXX
  SG_ BRAKE_ON_2 : 7|1@1+ (1,0) [0|255] "" XXX
  SG_ NO_BRAKE_2 : 15|1@0+ (1,0) [0|7] "" XXX
+ SG_ GEAR : 48|5@1+ (1,0) [0|255] "" XXX
 
 BO_ 533 WHEEL_SPEEDS: 8 XXX
  SG_ FL : 7|16@0+ (0.01,-100) [0|16383] "kph" XXX
@@ -111,6 +111,7 @@ BO_ 582 CAM_LANEMAYBE: 8 XXX
  SG_ NEW_SIGNAL_1 : 31|16@0- (1,0) [0|65535] "" XXX
  SG_ NEW_SIGNAL_2 : 55|16@0+ (1,0) [0|65535] "" XXX
  SG_ CTR : 7|2@0+ (1,0) [0|3] "" XXX
+ SG_ NEW_SIGNAL_3 : 15|16@0+ (1,0) [0|65535] "" XXX
 
 BO_ 541 CAM_EMPTY: 8 XXX
 
@@ -139,11 +140,12 @@ BO_ 579 CAM_LKAS: 8 XXX
  SG_ ERR_BIT_1 : 16|1@0+ (1,0) [0|1] "" XXX
  SG_ CHKSUM : 63|8@0+ (1,0) [0|15] "" XXX
  SG_ LINE_NOT_VISIBLE : 19|1@0+ (1,0) [0|1] "" XXX
- SG_ BIT_2 : 33|1@0+ (1,0) [0|1] "" XXX
- SG_ ERR_BIT_2 : 30|1@0+ (1,0) [0|1] "" XXX
  SG_ BIT_1 : 29|1@0+ (1,0) [0|1] "" XXX
  SG_ LDW : 23|1@0+ (1,0) [0|1] "" XXX
  SG_ LKAS_REQUEST : 3|12@0+ (1,-2048) [0|2048] "" XXX
+ SG_ ERR_BIT_2 : 30|1@0+ (1,0) [0|1] "" XXX
+ SG_ LKAS_ANGLE : 33|12@0+ (0.022,-45.06) [0|1] "" XXX
+ SG_ BIT2 : 52|1@0+ (1,0) [0|1] "" XXX
 
 BO_ 580 CAM_DISTANCE: 8 XXX
  SG_ S1 : 0|8@1+ (1,0) [0|127] "" XXX
@@ -165,14 +167,15 @@ BO_ 581 CAM_IDK3: 8 XXX
  SG_ S8 : 48|8@1+ (1,0) [0|255] "" XXX
  SG_ S9 : 56|8@1+ (1,0) [0|255] "" XXX
 
-BO_ 863 CAM_STATUS: 8 XXX
- SG_ NEW_SIGNAL_1 : 32|1@0+ (1,0) [0|32767] "" XXX
- SG_ NEW_SIGNAL_5 : 4|2@0+ (1,0) [0|32767] "" XXX
- SG_ NEW_SIGNAL_4 : 15|4@0+ (1,0) [0|15] "" XXX
+BO_ 863 CAM_TRAFFIC_SIGNS: 8 XXX
  SG_ STOP_SIGN : 31|4@0+ (1,0) [0|1] "" XXX
  SG_ NEW_SIGNAL_3 : 55|1@0+ (1,0) [0|127] "" XXX
- SG_ NEW_SIGNAL_6 : 0|3@1+ (1,0) [0|7] "" XXX
  SG_ FORWARD_COLLISION : 40|8@1+ (1,0) [0|7] "" XXX
+ SG_ SPEED_SIGN : 4|7@0+ (1,0) [0|15] "" XXX
+ SG_ NEW_SIGNAL_2 : 52|5@0+ (1,0) [0|31] "" XXX
+ SG_ NEW_SIGNAL_4 : 33|1@0+ (1,0) [0|1] "" XXX
+ SG_ NEW_SIGNAL_1 : 13|2@0+ (1,0) [0|3] "" XXX
+ SG_ SPEED_SIGN_CAM : 32|1@0+ (1,0) [0|32767] "" XXX
 
 BO_ 1157 CAM_SETTINGS: 8 XXX
  SG_ NEW_SIGNAL_2 : 14|1@0+ (1,0) [0|1] "" XXX
@@ -193,7 +196,7 @@ BO_ 1088 CAM_LANEINFO: 8 XXX
  SG_ BIT3 : 62|1@0+ (1,0) [0|3] "" XXX
  SG_ HANDS_ON_STEER_WARN_2 : 59|1@0+ (1,0) [0|1] "" XXX
  SG_ HANDS_ON_STEER_WARN : 56|1@0+ (1,0) [0|3] "" XXX
- SG_ S1_NOT : 54|1@0+ (1,0) [0|31] "" XXX
+ SG_ S1_HBEAM : 54|1@0+ (1,0) [0|31] "" XXX
  SG_ S1 : 52|1@0+ (1,0) [0|1] "" XXX
  SG_ HANDS_WARN_3_BITS : 51|3@0+ (1,0) [0|7] "" XXX
  SG_ ERR_BIT : 40|1@0+ (1,0) [0|1] "" XXX
@@ -545,7 +548,7 @@ BO_ 535 CURVE_CTRS: 8 XXX
  SG_ CTR_C_2 : 23|3@0+ (1,0) [0|255] "" XXX
  SG_ CTR_D_2 : 31|3@0+ (1,0) [0|7] "" XXX
  SG_ CTR_D_1 : 28|3@0+ (1,0) [0|7] "" XXX
- SG_ CURVE : 39|16@0+ (1,0) [0|7] "" XXX
+ SG_ SPEED : 39|16@0+ (0.01,0) [0|7] "kph" XXX
  SG_ CTR : 55|8@0+ (1,0) [0|255] "" XXX
  SG_ CHK_MAYBE : 63|8@0+ (1,0) [0|255] "" XXX
  SG_ NEW_SIGNAL_1 : 0|1@0+ (1,0) [0|1] "" XXX
@@ -570,6 +573,9 @@ BO_ 540 CRZ_CTRL: 8 XXX
  SG_ CRZ_ACTIVE : 3|1@0+ (1,0) [0|1] "" XXX
  SG_ HANDS_OFF_STEERING : 48|1@0+ (1,0) [0|1] "" XXX
  SG_ HANDS_ON_STEER_WARN : 59|4@0+ (1,0) [0|255] "" XXX
+ SG_ NEW_SIGNAL_1 : 52|1@0+ (1,0) [0|1] "" XXX
+ SG_ NEW_SIGNAL_2 : 45|3@0+ (1,0) [0|255] "" XXX
+ SG_ NEW_SIGNAL_8 : 0|1@0+ (1,0) [0|1] "" XXX
 
 BO_ 539 CRZ_INFO: 8 XXX
  SG_ NEW_SIGNAL_1 : 17|1@0+ (1,0) [0|255] "" XXX
@@ -614,14 +620,14 @@ BO_ 1179 2017_7: 8 XXX
 
 BO_ 1435 2017_8: 8 XXX
 
-BO_ 253 NEW_MSG_7: 8 XXX
+BO_ 253 GAS: 8 XXX
  SG_ NEW_SIGNAL_1 : 16|1@0+ (1,0) [0|65535] "" XXX
  SG_ CTR : 23|4@0+ (1,0) [0|15] "" XXX
  SG_ NEW_SIGNAL_2 : 41|1@0+ (1,0) [0|255] "" XXX
- SG_ NEW_SIGNAL_3 : 55|8@0+ (1,0) [0|255] "" XXX
  SG_ CRZ_NOT_ACTIVE : 61|1@0+ (1,0) [0|255] "" XXX
+ SG_ GAS_CMD : 55|8@0+ (1,0) [0|255] "" XXX
 
-BO_ 359 NEW_MSG_11: 8 XXX
+BO_ 359 MORE_GAS: 8 XXX
  SG_ NEW_SIGNAL_1 : 15|1@0+ (1,0) [0|255] "" XXX
  SG_ NEW_SIGNAL_2 : 7|8@0+ (1,0) [0|255] "" XXX
  SG_ CTR : 31|4@0+ (1,0) [0|255] "" XXX
@@ -700,6 +706,7 @@ BO_ 1143 BSM: 8 XXX
  SG_ RIGHT_BS1 : 14|1@0+ (1,0) [0|63] "" XXX
  SG_ RIGHT_BS_DISTANCE : 35|3@0+ (1,0) [0|1] "" XXX
  SG_ NEW_SIGNAL_1 : 32|1@0+ (1,0) [0|1] "" XXX
+ SG_ REAR_CT_ALERT : 23|5@0+ (1,0) [0|63] "" XXX
 
 BO_ 1361 KEY_POSITION: 8 XXX
 
@@ -744,8 +751,11 @@ BO_ 1248 MOB4: 8 XXX
 
 
 
+CM_ SG_ 357 GEAR "13P, 26R, 13N, 24D";
 CM_ SG_ 605 PED_BRAKE "3: no brake, 4: brake";
 CM_ SG_ 605 BRAKE_WARNING "Flashing brake warning and audible alert for potential forward collision";
+CM_ SG_ 863 SPEED_SIGN "speed limit in MPH";
+CM_ SG_ 863 SPEED_SIGN_CAM "1: The speed limit is recognized by the camera. 0: speed limit is map based or is not available";
 CM_ SG_ 1157 SBS_WARNING_DISTANCE "1 far, 2 mid, 3 near";
 CM_ SG_ 1157 SBS_SCBC "1 off, 2 on";
 CM_ SG_ 1157 LKAS_ASSIT_TIMING "1 at, 0 before";
@@ -758,3 +768,4 @@ CM_ SG_ 157 CAN_OFF "Disengage Cruise if enabled, if already disabled  TURN it O
 CM_ SG_ 552 GEAR "0 P/N, 12 R, 2 D M1, 4 M2, 14 Shift";
 CM_ SG_ 552 MORE_GEAR "";
 CM_ SG_ 540 HANDS_ON_STEER_WARN "0 no warning, b warning";
+CM_ SG_ 1143 REAR_CT_ALERT "Rear Cross Traffic Alert";
diff --git a/nissan_leaf_2018.dbc b/nissan_leaf_2018.dbc
new file mode 100644
index 00000000000000..e9debed577bfe3
--- /dev/null
+++ b/nissan_leaf_2018.dbc
@@ -0,0 +1,211 @@
+VERSION ""
+
+
+NS_ :
+    NS_DESC_
+    CM_
+    BA_DEF_
+    BA_
+    VAL_
+    CAT_DEF_
+    CAT_
+    FILTER
+    BA_DEF_DEF_
+    EV_DATA_
+    ENVVAR_DATA_
+    SGTYPE_
+    SGTYPE_VAL_
+    BA_DEF_SGTYPE_
+    BA_SGTYPE_
+    SIG_TYPE_REF_
+    VAL_TABLE_
+    SIG_GROUP_
+    SIG_VALTYPE_
+    SIGTYPE_VALTYPE_
+    BO_TX_BU_
+    BA_DEF_REL_
+    BA_REL_
+    BA_DEF_DEF_REL_
+    BU_SG_REL_
+    BU_EV_REL_
+    BU_BO_REL_
+    SG_MUL_VAL_
+
+BS_:
+
+BU_: XXX
+
+
+BO_ 2 STEER_ANGLE_SENSOR: 8 XXX
+ SG_ STEER_ANGLE_RATE : 16|8@1+ (1,0) [0|255] "" XXX
+ SG_ SET_ME_X07 : 24|8@1+ (1,0) [0|255] "" XXX
+ SG_ STEER_ANGLE : 0|16@1- (-0.1,0) [0|65535] "" XXX
+ SG_ COUNTER : 32|4@1+ (1,0) [0|15] "" XXX
+
+BO_ 42 SEATBELT: 8 XXX
+ SG_ SEATBELT_DRIVER_LATCHED : 27|1@1+ (1,0) [0|3] "" XXX
+ SG_ SEATBELT_DRIVER_UNLATCHED : 26|1@0+ (1,0) [0|1] "" XXX
+ SG_ unknown2 : 31|4@0+ (1,0) [0|15] "" XXX
+ SG_ unknown3 : 24|2@1+ (1,0) [0|3] "" XXX
+ SG_ unknown1 : 7|24@0+ (1,0) [0|16777215] "" XXX
+ SG_ unknown4 : 39|16@0+ (1,0) [0|65535] "" XXX
+
+BO_ 361 LKAS: 8 XXX
+ SG_ MAX_TORQUE : 39|8@0+ (0.01,0) [0|255] "Nm" XXX
+ SG_ SET_0x80 : 47|8@0+ (1,0) [0|255] "" XXX
+ SG_ LKA_ACTIVE : 52|1@0+ (1,0) [0|15] "" XXX
+ SG_ SET_0x80_2 : 31|8@0+ (1,0) [0|255] "" XXX
+ SG_ COUNTER : 51|4@0+ (1,0) [0|15] "" XXX
+ SG_ DESIRED_ANGLE : 7|18@0+ (-0.01,1310) [0|255] "" XXX
+ SG_ CHECKSUM : 63|8@0+ (1,0) [0|255] "" XXX
+
+BO_ 389 STEER_TORQUE_SENSOR: 8 XXX
+ SG_ LKAS_ACTIVE : 37|1@0+ (1,0) [0|3] "" XXX
+ SG_ STEER_TORQUE_LKAS : 47|8@0+ (1,0) [0|255] "" XXX
+ SG_ STEER_ANGLE : 23|18@0+ (-0.01,1310) [0|262143] "" XXX
+ SG_ STEER_TORQUE_DRIVER : 7|12@0+ (-0.01,20.47) [0|4095] "Nm" XXX
+ SG_ COUNTER : 51|4@0+ (1,0) [0|15] "" XXX
+ SG_ CHECKSUM : 63|8@0+ (1,0) [0|127] "" XXX
+
+BO_ 460 BRAKE_PEDAL: 8 XXX
+ SG_ BRAKE_PEDAL : 7|8@0+ (1,0) [0|256] "" XXX
+
+BO_ 569 CRUISE_THROTTLE: 8 XXX
+ SG_ GAS_PEDAL_INVERTED : 15|8@0+ (1,0) [0|255] "" XXX
+ SG_ GAS_PEDAL : 7|8@0+ (1,0) [0|255] "" XXX
+ SG_ CRUISE_AVAILABLE : 17|1@0+ (1,0) [0|1] "" XXX
+ SG_ unsure1 : 23|6@0+ (1,0) [0|63] "" XXX
+ SG_ unsure2 : 16|1@0+ (1,0) [0|1] "" XXX
+ SG_ unsure3 : 31|2@0+ (1,0) [0|3] "" XXX
+ SG_ NO_BUTTON_PRESSED : 29|1@0+ (1,0) [0|1] "" XXX
+ SG_ RES_BUTTON : 28|1@0+ (1,0) [0|1] "" XXX
+ SG_ SET_BUTTON : 27|1@0+ (1,0) [0|1] "" XXX
+ SG_ FOLLOW_DISTANCE_BUTTON : 26|1@0+ (1,0) [0|1] "" XXX
+ SG_ CANCEL_BUTTON : 25|1@0+ (1,0) [0|1] "" XXX
+ SG_ PROPILOT_BUTTON : 24|1@0+ (1,0) [0|1] "" XXX
+ SG_ unsure4 : 39|6@0+ (1,0) [0|63] "" XXX
+ SG_ COUNTER : 32|2@1+ (1,0) [0|3] "" XXX
+ SG_ unsure5 : 47|8@0+ (1,0) [0|255] "" XXX
+ SG_ unsure6 : 55|8@0+ (1,0) [0|255] "" XXX
+ SG_ unsure7 : 63|8@0+ (1,0) [0|255] "" XXX
+
+BO_ 640 CANCEL_MSG: 8 XXX
+  SG_ CANCEL_SEATBELT : 1|1@0+ (1,0) [0|1] "" XXX
+  SG_ NEW_SIGNAL_1 : 7|6@0+ (1,0) [0|63] "" XXX
+  SG_ NEW_SIGNAL_2 : 0|1@0+ (1,0) [0|1] "" XXX
+  SG_ NEW_SIGNAL_3 : 15|56@0+ (1,0) [0|72057594037927940] "" XXX
+
+BO_ 644 WHEEL_SPEEDS_FRONT: 8 XXX
+ SG_ WHEEL_SPEED_FR : 7|16@0+ (0.005,0) [0|65535] "KPH" XXX
+ SG_ WHEEL_SPEED_FL : 23|16@0+ (0.005,0) [0|65535] "KPH" XXX
+
+BO_ 645 WHEEL_SPEEDS_REAR: 8 XXX
+ SG_ WHEEL_SPEED_RR : 7|16@0+ (0.005,0) [0|65535] "KPH" XXX
+ SG_ WHEEL_SPEED_RL : 23|16@0+ (0.005,0) [0|65535] "KPH" XXX
+
+BO_ 689 PROPILOT_HUD: 8 XXX
+ SG_ LARGE_WARNING_FLASHING : 9|1@0+ (1,0) [0|1] "" XXX
+ SG_ SIDE_RADAR_ERROR_FLASHING1 : 10|1@0+ (1,0) [0|1] "" XXX
+ SG_ SIDE_RADAR_ERROR_FLASHING2 : 11|1@0+ (1,0) [0|1] "" XXX
+ SG_ RIGHT_LANE_YELLOW_FLASH : 12|1@0+ (1,0) [0|1] "" XXX
+ SG_ LEFT_LANE_YELLOW_FLASH : 13|1@0+ (1,0) [0|1] "" XXX
+ SG_ LEAD_CAR : 14|1@0+ (1,0) [0|1] "" XXX
+ SG_ LEAD_CAR_ERROR : 15|1@0+ (1,0) [0|1] "" XXX
+ SG_ FRONT_RADAR_ERROR : 16|1@0+ (1,0) [0|1] "" XXX
+ SG_ FRONT_RADAR_ERROR_FLASHING : 17|1@0+ (1,0) [0|1] "" XXX
+ SG_ RIGHT_LANE_GREEN : 24|1@0+ (1,0) [0|1] "" XXX
+ SG_ LEFT_LANE_GREEN : 25|1@0+ (1,0) [0|1] "" XXX
+ SG_ SIDE_RADAR_ERROR_FLASHING3 : 27|1@0+ (1,0) [0|1] "" XXX
+ SG_ LKAS_ERROR_FLASHING : 29|1@0+ (1,0) [0|1] "" XXX
+ SG_ SAFETY_SHIELD_ACTIVE : 44|1@0+ (1,0) [0|1] "" XXX
+ SG_ LARGE_STEERING_WHEEL_ICON : 61|2@0+ (1,0) [0|3] "" XXX
+ SG_ RIGHT_LANE_GREEN_FLASH : 62|1@0+ (1,0) [0|1] "" XXX
+ SG_ LEFT_LANE_GREEN_FLASH : 63|1@0+ (1,0) [0|1] "" XXX
+ SG_ FOLLOW_DISTANCE : 3|2@0+ (1,0) [0|3] "" XXX
+ SG_ AUDIBLE_TONE : 47|3@0+ (1,0) [0|8] "" XXX
+ SG_ SPEED_SET_ICON : 7|2@0+ (1,0) [0|3] "" XXX
+ SG_ SMALL_STEERING_WHEEL_ICON : 42|3@0+ (1,0) [0|7] "" XXX
+ SG_ SET_SPEED : 39|8@0+ (1,0) [0|255] "" XXX
+ SG_ unknown02 : 1|2@0+ (1,0) [0|3] "" XXX
+ SG_ unknown05 : 5|2@0+ (1,0) [0|3] "" XXX
+ SG_ unknown08 : 8|7@0+ (1,0) [0|63] "" XXX
+ SG_ unknown26 : 26|1@0+ (1,0) [0|1] "" XXX
+ SG_ unknown28 : 28|1@0+ (1,0) [0|1] "" XXX
+ SG_ unknown31 : 31|2@0+ (1,0) [0|3] "" XXX
+ SG_ unknown43 : 43|1@0+ (1,0) [0|1] "" XXX
+ SG_ unknown55 : 55|8@0+ (1,0) [0|63] "" XXX
+ SG_ unknown59 : 59|4@0+ (1,0) [0|15] "" XXX
+
+BO_ 783 CRUISE_STATE: 8 XXX
+ SG_ CRUISE_ENABLED : 3|1@0+ (1,0) [0|1] "" XXX
+
+BO_ 852 ESP: 8 XXX
+ SG_ ESP_DISABLED : 38|1@0+ (1,0) [0|1] "" XXX
+
+BO_ 853 HUD_SETTINGS: 8 XXX
+ SG_ SPEED_MPH : 37|1@0+ (1,0) [0|1] "" XXX
+
+BO_ 856 LIGHTS: 8 XXX
+ SG_ LEFT_BLINKER : 17|1@0+ (1,0) [0|1] "" XXX
+ SG_ RIGHT_BLINKER : 18|1@0+ (1,0) [0|1] "" XXX
+
+BO_ 1057 GEARBOX: 3 XXX
+ SG_ GEAR_SHIFTER : 5|3@0+ (1,0) [0|255] "" XXX
+
+BO_ 1228 PROPILOT_HUD_INFO_MSG: 8 XXX
+ SG_ NA_HIGH_ACCEL_TEMP : 0|1@0+ (1,0) [0|1] "" XXX
+ SG_ SIDE_RADAR_NA_HIGH_CABIN_TEMP : 8|1@0+ (1,0) [0|1] "" XXX
+ SG_ SIDE_RADAR_MALFUNCTION : 11|1@0+ (1,0) [0|1] "" XXX
+ SG_ LKAS_MALFUNCTION : 12|1@0+ (1,0) [0|1] "" XXX
+ SG_ FRONT_RADAR_MALFUNCTION : 13|1@0+ (1,0) [0|1] "" XXX
+ SG_ SIDE_RADAR_NA_CLEAN_REAR_CAMERA : 14|1@0+ (1,0) [0|1] "" XXX
+ SG_ NA_POOR_ROAD_CONDITIONS : 16|1@0+ (1,0) [0|1] "" XXX
+ SG_ CURRENTLY_UNAVAILABLE : 17|1@0+ (1,0) [0|1] "" XXX
+ SG_ SAFETY_SHIELD_OFF : 18|1@0+ (1,0) [0|1] "" XXX
+ SG_ FRONT_COLLISION_NA_FRONT_RADAR_OBSTRUCTION : 20|1@0+ (1,0) [0|1] "" XXX
+ SG_ PEDAL_MISSAPPLICATION_SYSTEM_ACTIVATED : 24|1@0+ (1,0) [0|1] "" XXX
+ SG_ SIDE_IMPACT_NA_RADAR_OBSTRUCTION : 25|1@0+ (1,0) [0|1] "" XXX
+ SG_ WARNING_DO_NOT_ENTER : 33|1@0+ (1,0) [0|1] "" XXX
+ SG_ SIDE_IMPACT_SYSTEM_OFF : 34|1@0+ (1,0) [0|1] "" XXX
+ SG_ SIDE_IMPACT_MALFUNCTION : 35|1@0+ (1,0) [0|1] "" XXX
+ SG_ FRONT_COLLISION_MALFUNCTION : 36|1@0+ (1,0) [0|1] "" XXX
+ SG_ SIDE_RADAR_MALFUNCTION2 : 37|1@0+ (1,0) [0|1] "" XXX
+ SG_ LKAS_MALFUNCTION2 : 38|1@0+ (1,0) [0|1] "" XXX
+ SG_ FRONT_RADAR_MALFUNCTION2 : 39|1@0+ (1,0) [0|1] "" XXX
+ SG_ PROPILOT_NA_MSGS : 42|3@0+ (1,0) [0|7] "" XXX
+ SG_ BOTTOM_MSG : 45|3@0+ (1,0) [0|7] "" XXX
+ SG_ HANDS_ON_WHEEL_WARNING : 47|1@0+ (1,0) [0|1] "" XXX
+ SG_ WARNING_STEP_ON_BRAKE_NOW : 51|1@0+ (1,0) [0|1] "" XXX
+ SG_ PROPILOT_NA_FRONT_CAMERA_OBSTRUCTED : 52|1@0+ (1,0) [0|1] "" XXX
+ SG_ PROPILOT_NA_HIGH_CABIN_TEMP : 53|1@0+ (1,0) [0|1] "" XXX
+ SG_ WARNING_PROPILOT_MALFUNCTION : 54|1@0+ (1,0) [0|3] "" XXX
+ SG_ ACC_UNAVAILABLE_HIGH_CABIN_TEMP : 62|1@0+ (1,0) [0|1] "" XXX
+ SG_ ACC_NA_FRONT_CAMERA_IMPARED : 63|1@0+ (1,0) [0|1] "" XXX
+ SG_ unknown07 : 7|7@0+ (1,0) [0|127] "" XXX
+ SG_ unknown10 : 10|2@0+ (1,0) [0|3] "" XXX
+ SG_ unknown15 : 15|1@0+ (1,0) [0|1] "" XXX
+ SG_ unknown23 : 23|3@0+ (1,0) [0|7] "" XXX
+ SG_ unknown19 : 19|1@0+ (1,0) [0|1] "" XXX
+ SG_ unknown31 : 31|6@0+ (1,0) [0|63] "" XXX
+ SG_ unknown32 : 32|1@0+ (1,0) [0|1] "" XXX
+ SG_ unknown46 : 46|1@0+ (1,0) [0|1] "" XXX
+ SG_ unknown50 : 50|3@0+ (1,0) [0|7] "" XXX
+ SG_ unknown55 : 55|1@0+ (1,0) [0|1] "" XXX
+ SG_ unknown61 : 61|6@0+ (1,0) [0|63] "" XXX
+
+BO_ 1549 DOORS_LIGHTS: 8 XXX
+ SG_ DOOR_OPEN_FL : 3|1@0+ (1,0) [0|1] "" XXX
+ SG_ DOOR_OPEN_FR : 4|1@0+ (1,0) [0|1] "" XXX
+ SG_ DOOR_OPEN_RL : 5|1@0+ (1,0) [0|1] "" XXX
+ SG_ DOOR_OPEN_RR : 6|1@0+ (1,0) [0|1] "" XXX
+
+BO_ 1227 LKAS_SETTINGS: 8 XXX
+ SG_ LKAS_ENABLED : 51|1@0+ (1,0) [0|1] "" XXX
+
+VAL_ 1057 GEAR_SHIFTER 7 "B" 4 "D" 3 "N" 2 "R" 1 "P" ;
+VAL_ 1228 PROPILOT_NA_MSGS 0 "NO_MSG" 1 "NA_FRONT_CAMERA_IMPARED" 2 "STEERING_ASSIST_ON_STANDBY" 3 "NA_PARKING_ASSIST_ENABLED" 4 "STEER_ASSIST_CURRENTLY_NA" 5 "NA_BAD_WEATHER" 6 "NA_PARK_BRAKE_ON" 7 "NA_SEATBELT_NOT_FASTENED" ;
+VAL_ 1228 BOTTOM_MSG 0 "OK_STEER_ASSIST_SETTINGS" 1 "NO_MSG" 2 "PRESS_SET_TO_SET_SPEED" 3 "PRESS_RES_SET_TO_CHANGE_SPEED" 4 "PRESS_RES_TO_RESTART" 5 "NO_MSG" 6 "CRUISE_NOT_AVAIL" 7 "NO_MSG" ;
+VAL_ 689 FOLLOW_DISTANCE 0 "NO_FOLLOW_DISTANCE" 1 "FOLLOW_DISTANCE_1" 2 "FOLLOW_DISTANCE_2" 3 "FOLLOW_DISANCE_3" ;
+VAL_ 689 AUDIBLE_TONE 0 "NO_TONE" 1 "CONT" 2 "FAST_BEEP_CONT" 3 "TRIPLE_FAST_BEEP_CONT" 4 "SLOW_BEEP_CONT" 5 "QUAD_SLOW_BEEP_CONT" 6 "SINGLE_BEEP_ONCE" 7 "DOUBLE_BEEP_ONCE" ;
+VAL_ 689 SMALL_STEERING_WHEEL_ICON 0 "NO_ICON" 1 "GRAY_ICON" 2 "GRAY_ICON_FLASHING" 3 "GREEN_ICON" 4 "GREEN_ICON_FLASHING" 5 "RED_ICON" 6 "RED_ICON_FLASHING" 7 "YELLOW_ICON" ;
+VAL_ 689 LARGE_STEERING_WHEEL_ICON 0 "NO_STEERINGWHEEL" 1 "GRAY_STEERINGWHEEL" 2 "GREEN_STEERINGWHEEL" 3 "GREEN_STEERINGWHEEL_FLASHING" ;
diff --git a/nissan_2017.dbc b/nissan_x_trail_2017.dbc
similarity index 71%
rename from nissan_2017.dbc
rename to nissan_x_trail_2017.dbc
index 2fd0f0a0fed9c0..00c398c05c8104 100644
--- a/nissan_2017.dbc
+++ b/nissan_x_trail_2017.dbc
@@ -36,70 +36,41 @@ BS_:
 BU_: XXX
 
 
-BO_ 644 Speed_1: 8 XXX
- SG_ Speed_FR : 7|16@0+ (0.0118,0) [0|65535] "" XXX
- SG_ Speed_FL : 23|16@0+ (0.0118,0) [0|65535] "" XXX
- SG_ Speed_Vehicle : 39|16@0+ (0.0245,0) [0|65535] "" XXX
+BO_ 2 STEER_ANGLE_SENSOR: 8 XXX
+ SG_ STEER_ANGLE_RATE : 16|8@1+ (1,0) [0|255] "" XXX
+ SG_ SET_ME_X07 : 24|8@1+ (1,0) [0|255] "" XXX
+ SG_ STEER_ANGLE : 0|16@1- (-0.1,0) [0|65535] "" XXX
+ SG_ COUNTER : 32|4@1+ (1,0) [0|15] "" XXX
 
-BO_ 645 WheelspeedRear: 8 XXX
- SG_ RR : 7|16@0+ (0.00555,0) [0|65535] "KPH" XXX
- SG_ RL : 23|16@0+ (0.00555,0) [0|65535] "KPH" XXX
+BO_ 348 GAS_PEDAL: 8 XXX
+ SG_ GAS_PEDAL_RAW : 26|11@0+ (1,0) [0|2047] "" XXX
+ SG_ GAS_PEDAL : 47|10@0+ (1,0) [0|1023] "" XXX
 
-BO_ 768 STEER_TORQUE: 2 XXX
- SG_ STEERING_TORQUE : 6|7@0+ (1,0) [0|127] "" XXX
- SG_ DriverTouchingWheel : 15|1@0+ (-1,1) [0|7] "" XXX
-
-BO_ 459 Maybe_RegenBraking: 8 XXX
-
-BO_ 372 Maybe_Gear_Selector: 8 XXX
- SG_ Counter : 35|4@0+ (1,0) [0|15] "" XXX
-
-BO_ 374 Maybe_Motor_RPM_or_Speed: 8 XXX
- SG_ Counter : 51|4@0+ (1,0) [0|15] "" XXX
-
-BO_ 460 Maybe_Brake_Related: 8 XXX
-
-BO_ 2 SteeringWheel: 8 XXX
- SG_ Steering_RateChange : 16|8@1+ (1,0) [0|255] "" XXX
- SG_ Always_07 : 24|8@1+ (1,0) [0|255] "" XXX
- SG_ Steering_Angle : 0|16@1- (-0.1,0) [0|65535] "" XXX
- SG_ Counter : 32|4@1+ (1,0) [0|15] "" XXX
-
-BO_ 384 Maybe_PowerInfo: 8 XXX
- SG_ Unknown_Timer_PowerInfo : 51|4@0+ (1,0) [0|15] "" XXX
- SG_ EnginePower : 27|12@0- (1,0) [0|1] "" XXX
- SG_ RequestedAccel : 23|12@0- (1,0) [0|4294967295] "" XXX
-
-BO_ 1107 Lights: 8 XXX
- SG_ RIGHT_BLINKER : 12|1@0+ (1,0) [0|1] "" XXX
- SG_ LEFT_BLINKER : 11|1@0+ (1,0) [0|1] "" XXX
- SG_ _HEADLIGHTS : 5|1@0+ (1,0) [0|1] "" XXX
-
-BO_ 666 WheelspeedFront: 8 XXX
- SG_ _FL_WHEELSPEED : 39|16@0+ (0.01014,0) [0|65535] "" XXX
- SG_ FR : 7|16@0+ (0.00555,0) [0|65535] "KPH" XXX
- SG_ FL : 23|16@0+ (0.00555,0) [0|65535] "KPH" XXX
-
-BO_ 389 Steering: 8 XXX
+BO_ 361 LKAS: 8 XXX
+ SG_ MAX_TORQUE : 39|8@0+ (0.01,0) [0|255] "Nm" XXX
+ SG_ SET_0x80 : 47|8@0+ (1,0) [0|255] "" XXX
+ SG_ LKA_ACTIVE : 52|1@0+ (1,0) [0|15] "" XXX
+ SG_ SET_0x80_2 : 31|8@0+ (1,0) [0|255] "" XXX
  SG_ COUNTER : 51|4@0+ (1,0) [0|15] "" XXX
- SG_ LKAS_ACTIVE : 37|1@0+ (1,0) [0|3] "" XXX
- SG_ LKAS_Torque : 47|8@0+ (1,0) [0|255] "" XXX
- SG_ CRC : 63|8@0+ (1,0) [0|127] "" XXX
- SG_ Angle : 23|18@0+ (-0.01,1310) [0|262143] "" XXX
- SG_ DriverTorque : 7|12@0+ (-0.01,20.47) [0|4095] "Nm" XXX
-
-BO_ 851 SPEED_RELATED: 8 XXX
- SG_ SPEED_RELATED : 7|16@0+ (0.01014,0) [0|65535] "" XXX
+ SG_ DESIRED_ANGLE : 7|18@0+ (-0.01,1310) [0|255] "" XXX
+ SG_ CHECKSUM : 63|8@0+ (1,0) [0|255] "" XXX
 
-BO_ 386 Accelerator: 8 XXX
- SG_ Accelerator : 38|7@0+ (1,0) [0|127] "" XXX
+BO_ 389 STEER_TORQUE_SENSOR: 8 XXX
+ SG_ LKAS_ACTIVE : 37|1@0+ (1,0) [0|3] "" XXX
+ SG_ STEER_TORQUE_LKAS : 47|8@0+ (1,0) [0|255] "" XXX
+ SG_ STEER_ANGLE : 23|18@0+ (-0.01,1310) [0|262143] "" XXX
+ SG_ STEER_TORQUE_DRIVER : 7|12@0+ (-0.01,20.47) [0|4095] "Nm" XXX
+ SG_ COUNTER : 51|4@0+ (1,0) [0|15] "" XXX
+ SG_ CHECKSUM : 63|8@0+ (1,0) [0|127] "" XXX
 
-BO_ 348 Throttle: 8 XXX
- SG_ NEW_SIGNAL_1 : 7|8@0+ (1,0) [0|255] "" XXX
- SG_ Throttle : 26|11@0+ (1,0) [0|2047] "" XXX
- SG_ ThrottlePedal : 47|10@0+ (1,0) [0|1023] "" XXX
+BO_ 438 PRO_PILOT: 8 XXX
+ SG_ COUNTER : 55|4@0+ (1,0) [0|255] "" XXX
+ SG_ SET_ME_X03 : 33|2@0+ (1,0) [0|15] "" XXX
+ SG_ CRUISE_ACTIVATED : 38|1@0+ (1,0) [0|3] "" XXX
+ SG_ CRUISE_ON : 36|1@0+ (1,0) [0|255] "" XXX
+ SG_ STEER_STATUS : 51|1@0+ (1,0) [0|3] "" XXX
 
-BO_ 523 CruiseThrottle: 6 XXX
+BO_ 523 CRUISE_THROTTLE: 6 XXX
  SG_ PROPILOT_BUTTON : 8|1@0+ (1,0) [0|1] "" XXX
  SG_ CANCEL_BUTTON : 9|1@0+ (1,0) [0|1] "" XXX
  SG_ GAS_PEDAL_INVERTED : 37|10@0+ (1,0) [0|1023] "" XXX
@@ -111,13 +82,73 @@ BO_ 523 CruiseThrottle: 6 XXX
  SG_ USER_BRAKE_PRESSED : 21|1@0+ (1,0) [0|1] "" XXX
  SG_ USER_BRAKE_PRESSED_INVERTED : 22|1@0+ (1,0) [0|3] "" XXX
  SG_ NEW_SIGNAL_2 : 23|1@0+ (1,0) [0|1] "" XXX
- SG_ unsure2 : 43|4@0+ (1,0) [0|1] "" XXX
- SG_ unsure1 : 7|16@0+ (1,0) [0|15] "" XXX
  SG_ GAS_PRESSED_INVERTED : 20|1@0+ (1,0) [0|255] "" XXX
  SG_ COUNTER : 17|2@0+ (1,0) [0|3] "" XXX
+ SG_ unsure1 : 7|10@0+ (1,0) [0|1023] "" XXX
+ SG_ unsure2 : 43|4@0+ (1,0) [0|1] "" XXX
  SG_ unsure3 : 19|2@0+ (1,0) [0|3] "" XXX
 
-BO_ 1108 DoorsLights: 8 XXX
+BO_ 645 WHEEL_SPEEDS_REAR: 8 XXX
+ SG_ WHEEL_SPEED_RR : 7|16@0+ (0.005,0) [0|65535] "KPH" XXX
+ SG_ WHEEL_SPEED_RL : 23|16@0+ (0.005,0) [0|65535] "KPH" XXX
+
+BO_ 665 ESP: 8 XXX
+ SG_ ESP_DISABLED : 24|1@0+ (1,0) [0|1] "" XXX
+
+BO_ 666 WHEEL_SPEEDS_FRONT: 8 XXX
+ SG_ WHEEL_SPEED_FR : 7|16@0+ (0.005,0) [0|65535] "KPH" XXX
+ SG_ WHEEL_SPEED_FL : 23|16@0+ (0.005,0) [0|65535] "KPH" XXX
+
+BO_ 689 PROPILOT_HUD: 8 XXX
+ SG_ LARGE_WARNING_FLASHING : 9|1@0+ (1,0) [0|1] "" XXX
+ SG_ SIDE_RADAR_ERROR_FLASHING1 : 10|1@0+ (1,0) [0|1] "" XXX
+ SG_ SIDE_RADAR_ERROR_FLASHING2 : 11|1@0+ (1,0) [0|1] "" XXX
+ SG_ RIGHT_LANE_YELLOW_FLASH : 12|1@0+ (1,0) [0|1] "" XXX
+ SG_ LEFT_LANE_YELLOW_FLASH : 13|1@0+ (1,0) [0|1] "" XXX
+ SG_ LEAD_CAR : 14|1@0+ (1,0) [0|1] "" XXX
+ SG_ LEAD_CAR_ERROR : 15|1@0+ (1,0) [0|1] "" XXX
+ SG_ FRONT_RADAR_ERROR : 16|1@0+ (1,0) [0|1] "" XXX
+ SG_ FRONT_RADAR_ERROR_FLASHING : 17|1@0+ (1,0) [0|1] "" XXX
+ SG_ RIGHT_LANE_GREEN : 24|1@0+ (1,0) [0|1] "" XXX
+ SG_ LEFT_LANE_GREEN : 25|1@0+ (1,0) [0|1] "" XXX
+ SG_ SIDE_RADAR_ERROR_FLASHING3 : 27|1@0+ (1,0) [0|1] "" XXX
+ SG_ LKAS_ERROR_FLASHING : 29|1@0+ (1,0) [0|1] "" XXX
+ SG_ SAFETY_SHIELD_ACTIVE : 44|1@0+ (1,0) [0|1] "" XXX
+ SG_ LARGE_STEERING_WHEEL_ICON : 61|2@0+ (1,0) [0|3] "" XXX
+ SG_ RIGHT_LANE_GREEN_FLASH : 62|1@0+ (1,0) [0|1] "" XXX
+ SG_ LEFT_LANE_GREEN_FLASH : 63|1@0+ (1,0) [0|1] "" XXX
+ SG_ FOLLOW_DISTANCE : 3|2@0+ (1,0) [0|3] "" XXX
+ SG_ AUDIBLE_TONE : 47|3@0+ (1,0) [0|8] "" XXX
+ SG_ SPEED_SET_ICON : 7|2@0+ (1,0) [0|3] "" XXX
+ SG_ SMALL_STEERING_WHEEL_ICON : 42|3@0+ (1,0) [0|7] "" XXX
+ SG_ SET_SPEED : 39|8@0+ (1,0) [0|255] "" XXX
+ SG_ unknown02 : 1|2@0+ (1,0) [0|3] "" XXX
+ SG_ unknown05 : 5|2@0+ (1,0) [0|3] "" XXX
+ SG_ unknown08 : 8|7@0+ (1,0) [0|63] "" XXX
+ SG_ unknown26 : 26|1@0+ (1,0) [0|1] "" XXX
+ SG_ unknown28 : 28|1@0+ (1,0) [0|1] "" XXX
+ SG_ unknown31 : 31|2@0+ (1,0) [0|3] "" XXX
+ SG_ unknown43 : 43|1@0+ (1,0) [0|1] "" XXX
+ SG_ unknown55 : 55|8@0+ (1,0) [0|63] "" XXX
+ SG_ unknown59 : 59|4@0+ (1,0) [0|15] "" XXX
+
+BO_ 768 STEER_TORQUE_SENSOR2: 2 XXX
+ SG_ STEERING_TORQUE : 6|7@0+ (1,0) [0|127] "" XXX
+ SG_ STEERING_PRESSED : 15|1@0+ (-1,1) [0|7] "" XXX
+
+BO_ 783 CRUISE_STATE: 8 XXX
+ SG_ CRUISE_ENABLED : 3|1@0+ (1,0) [0|1] "" XXX
+
+BO_ 1055 GEARBOX: 2 XXX
+ SG_ SPORTS_MODE : 13|1@0+ (1,0) [0|1] "" XXX
+ SG_ GEAR_SHIFTER : 5|3@0+ (1,0) [0|255] "" XXX
+
+BO_ 1107 LIGHTS: 8 XXX
+ SG_ RIGHT_BLINKER : 12|1@0+ (1,0) [0|1] "" XXX
+ SG_ LEFT_BLINKER : 11|1@0+ (1,0) [0|1] "" XXX
+ SG_ HEADLIGHTS : 5|1@0+ (1,0) [0|1] "" XXX
+
+BO_ 1108 DOORS_LIGHTS: 8 XXX
  SG_ DOOR_CLOSED_RR : 40|1@0+ (1,0) [0|1] "" XXX
  SG_ DOOR_OPEN_RR : 41|1@0+ (1,0) [0|1] "" XXX
  SG_ DOOR_CLOSED_RL : 42|1@0+ (1,0) [0|1] "" XXX
@@ -130,49 +161,6 @@ BO_ 1108 DoorsLights: 8 XXX
  SG_ BRAKE_LIGHT : 54|1@0+ (1,0) [0|1] "" XXX
  SG_ USER_BRAKE_PRESSED : 23|1@0+ (1,0) [0|1] "" XXX
 
-BO_ 403 LKAS_OLD: 8 XXX
- SG_ Checksum : 63|8@0+ (1,0) [0|255] "" XXX
- SG_ Angle_2 : 32|13@0+ (1,-4000) [0|63] "" XXX
- SG_ Counter : 51|4@0+ (1,0) [0|15] "" XXX
- SG_ Angle_1 : 10|13@0+ (0.12,-480) [0|65535] "" XXX
- SG_ Steering_Torque : 7|13@0+ (-1,4000) [0|65535] "" XXX
- SG_ Torque_Command : 29|13@0+ (1,-4000) [0|255] "" XXX
-
-BO_ 361 LKAS: 8 XXX
- SG_ MAX_TORQUE : 39|8@0+ (0.01,0) [0|255] "Nm" XXX
- SG_ SET_0x80 : 47|8@0+ (1,0) [0|255] "" XXX
- SG_ LKA_ACTIVE : 52|1@0+ (1,0) [0|15] "" XXX
- SG_ CRC : 63|8@0+ (1,0) [0|255] "" XXX
- SG_ SET_0x80_2 : 31|8@0+ (1,0) [0|255] "" XXX
- SG_ COUNTER : 51|4@0+ (1,0) [0|15] "" XXX
- SG_ DESIRED_ANGLE : 7|18@0+ (-0.01,1310) [0|255] "" XXX
-
-BO_ 438 ProPilot: 8 XXX
- SG_ NEW_SIGNAL_2 : 11|4@0+ (1,0) [0|255] "" XXX
- SG_ NEW_SIGNAL_4 : 27|4@0+ (1,0) [0|255] "" XXX
- SG_ NEW_SIGNAL_8 : 63|8@0+ (1,0) [0|7] "" XXX
- SG_ Counter : 55|4@0+ (1,0) [0|255] "" XXX
- SG_ NEW_SIGNAL_6 : 47|8@0+ (1,0) [0|255] "" XXX
- SG_ SET_3 : 33|2@0+ (1,0) [0|15] "" XXX
- SG_ NEW_SIGNAL_1 : 7|12@0- (1,0) [0|255] "" XXX
- SG_ NEW_SIGNAL_3 : 23|12@0- (-1,0) [0|255] "" XXX
- SG_ CRUISE_ACTIVATED : 38|1@0+ (1,0) [0|3] "" XXX
- SG_ CRUISE_ON : 36|1@0+ (1,0) [0|255] "" XXX
- SG_ STEER_STATUS : 51|1@0+ (1,0) [0|3] "" XXX
-
-BO_ 397 _GEAR: 8 XXX
- SG_ GEAR : 27|4@0+ (1,0) [0|15] "" XXX
-
-BO_ 1273 _SEATBELT: 7 XXX
- SG_ DRIVERS_SEATBELT : 25|1@0+ (1,0) [0|1] "" XXX
-
-BO_ 665 _ESP: 8 XXX
- SG_ ESP_DISABLED : 24|1@0+ (1,0) [0|1] "" XXX
-
-BO_ 1055 GEARBOX: 2 XXX
- SG_ SPORTS_MODE : 13|1@0+ (1,0) [0|1] "" XXX
- SG_ GEAR_SHIFTER : 5|3@0+ (1,0) [0|255] "" XXX
-
 BO_ 1228 PROPILOT_HUD_INFO_MSG: 8 XXX
  SG_ NA_HIGH_ACCEL_TEMP : 0|1@0+ (1,0) [0|1] "" XXX
  SG_ SIDE_RADAR_NA_HIGH_CABIN_TEMP : 8|1@0+ (1,0) [0|1] "" XXX
@@ -210,46 +198,15 @@ BO_ 1228 PROPILOT_HUD_INFO_MSG: 8 XXX
  SG_ unknown31 : 31|6@0+ (1,0) [0|63] "" XXX
  SG_ unknown32 : 32|1@0+ (1,0) [0|1] "" XXX
  SG_ unknown46 : 46|1@0+ (1,0) [0|1] "" XXX
- SG_ unknown61 : 61|6@0+ (1,0) [0|63] "" XXX
- SG_ unknown55 : 55|1@0+ (1,0) [0|1] "" XXX
  SG_ unknown50 : 50|3@0+ (1,0) [0|7] "" XXX
+ SG_ unknown55 : 55|1@0+ (1,0) [0|1] "" XXX
+ SG_ unknown61 : 61|6@0+ (1,0) [0|63] "" XXX
 
-BO_ 689 PROPILOT_HUD: 8 XXX
- SG_ LARGE_WARNING_FLASHING : 9|1@0+ (1,0) [0|1] "" XXX
- SG_ SIDE_RADAR_ERROR_FLASHING1 : 10|1@0+ (1,0) [0|1] "" XXX
- SG_ SIDE_RADAR_ERROR_FLASHING2 : 11|1@0+ (1,0) [0|1] "" XXX
- SG_ RIGHT_LANE_YELLOW_FLASH : 12|1@0+ (1,0) [0|1] "" XXX
- SG_ LEFT_LANE_YELLOW_FLASH : 13|1@0+ (1,0) [0|1] "" XXX
- SG_ LEAD_CAR : 14|1@0+ (1,0) [0|1] "" XXX
- SG_ LEAD_CAR_ERROR : 15|1@0+ (1,0) [0|1] "" XXX
- SG_ FRONT_RADAR_ERROR : 16|1@0+ (1,0) [0|1] "" XXX
- SG_ FRONT_RADAR_ERROR_FLASHING : 17|1@0+ (1,0) [0|1] "" XXX
- SG_ RIGHT_LANE_GREEN : 24|1@0+ (1,0) [0|1] "" XXX
- SG_ LEFT_LANE_GREEN : 25|1@0+ (1,0) [0|1] "" XXX
- SG_ SIDE_RADAR_ERROR_FLASHING3 : 27|1@0+ (1,0) [0|1] "" XXX
- SG_ LKAS_ERROR_FLASHING : 29|1@0+ (1,0) [0|1] "" XXX
- SG_ SAFETY_SHIELD_ACTIVE : 44|1@0+ (1,0) [0|1] "" XXX
- SG_ LARGE_STEERING_WHEEL_ICON : 61|2@0+ (1,0) [0|3] "" XXX
- SG_ RIGHT_LANE_GREEN_FLASH : 62|1@0+ (1,0) [0|1] "" XXX
- SG_ LEFT_LANE_GREEN_FLASH : 63|1@0+ (1,0) [0|1] "" XXX
- SG_ FOLLOW_DISTANCE : 3|2@0+ (1,0) [0|3] "" XXX
- SG_ AUDIBLE_TONE : 47|3@0+ (1,0) [0|8] "" XXX
- SG_ SPEED_SET_ICON : 7|2@0+ (1,0) [0|3] "" XXX
- SG_ SMALL_STEERING_WHEEL_ICON : 42|3@0+ (1,0) [0|7] "" XXX
- SG_ unknown59 : 59|4@0+ (1,0) [0|15] "" XXX
- SG_ unknown55 : 55|8@0+ (1,0) [0|63] "" XXX
- SG_ unknown26 : 26|1@0+ (1,0) [0|1] "" XXX
- SG_ unknown28 : 28|1@0+ (1,0) [0|1] "" XXX
- SG_ unknown31 : 31|2@0+ (1,0) [0|3] "" XXX
- SG_ unknown39 : 39|8@0+ (1,0) [0|255] "" XXX
- SG_ unknown43 : 43|1@0+ (1,0) [0|1] "" XXX
- SG_ unknown8 : 8|7@0+ (1,0) [0|63] "" XXX
- SG_ unknown05 : 5|2@0+ (1,0) [0|3] "" XXX
- SG_ unknown02 : 1|2@0+ (1,0) [0|3] "" XXX
-
-
-
+BO_ 1227 LKAS_SETTINGS: 8 XXX
+ SG_ LKAS_ENABLED : 51|1@0+ (1,0) [0|1] "" XXX
 
+BO_ 1273 SEATBELT: 7 XXX
+ SG_ SEATBELT_DRIVER_LATCHED : 25|1@0+ (1,0) [0|1] "" XXX
 
 VAL_ 1055 GEAR_SHIFTER 6 "L" 4 "D" 3 "N" 2 "R" 1 "P" ;
 VAL_ 1228 PROPILOT_NA_MSGS 0 "NO_MSG" 1 "NA_FRONT_CAMERA_IMPARED" 2 "STEERING_ASSIST_ON_STANDBY" 3 "NA_PARKING_ASSIST_ENABLED" 4 "STEER_ASSIST_CURRENTLY_NA" 5 "NA_BAD_WEATHER" 6 "NA_PARK_BRAKE_ON" 7 "NA_SEATBELT_NOT_FASTENED" ;
diff --git a/subaru_crosstrek_2018.dbc b/subaru_crosstrek_2018.dbc
index b766cdca87972d..050dfa1eb105d3 100644
--- a/subaru_crosstrek_2018.dbc
+++ b/subaru_crosstrek_2018.dbc
@@ -43,16 +43,16 @@ BO_ 2 Steering: 8 XXX
 
 BO_ 64 Throttle: 8 XXX
  SG_ Checksum : 0|8@1+ (1,0) [0|255] "" XXX
- SG_ Off_Accel : 60|4@1+ (1,0) [0|7] "" XXX
- SG_ NEW_SIGNAL_3 : 56|4@1+ (1,0) [0|255] "" XXX
- SG_ Throttle_Cruise : 40|8@1+ (1,0) [0|255] "" XXX
- SG_ Throttle_Combo : 55|8@1+ (1,0) [0|255] "" XXX
- SG_ Throttle_Pedal : 32|8@1+ (1,0) [0|255] "" XXX
- SG_ NEW_SIGNAL_2 : 48|7@1+ (1,0) [0|1] "" XXX
  SG_ Counter : 8|4@1+ (1,0) [0|255] "" XXX
- SG_ Engine_RPM : 16|12@1+ (1,0) [0|255] "" XXX
  SG_ NEW_SIGNAL_1 : 12|4@1+ (1,0) [0|1] "" XXX
+ SG_ Engine_RPM : 16|12@1+ (1,0) [0|255] "" XXX
  SG_ NEW_SIGNAL_4 : 28|5@1+ (1,0) [0|1] "" XXX
+ SG_ Throttle_Pedal : 32|8@1+ (1,0) [0|255] "" XXX
+ SG_ Throttle_Cruise : 40|8@1+ (1,0) [0|255] "" XXX
+ SG_ Throttle_Combo : 48|7@1+ (1,0) [0|1] "" XXX
+ SG_ Signal1 : 55|8@1+ (1,0) [0|255] "" XXX
+ SG_ NEW_SIGNAL_3 : 56|4@1+ (1,0) [0|255] "" XXX
+ SG_ Off_Accel : 60|4@1+ (1,0) [0|7] "" XXX
 
 BO_ 65 NEW_MSG_1: 8 XXX
  SG_ Checksum : 0|8@1+ (1,0) [0|255] "" XXX
@@ -63,12 +63,13 @@ BO_ 65 NEW_MSG_1: 8 XXX
  SG_ NEW_SIGNAL_6 : 48|8@1+ (1,0) [0|63] "" XXX
  SG_ NEW_SIGNAL_7 : 59|2@0+ (1,0) [0|255] "" XXX
 
-BO_ 72 NEW_MSG_2: 8 XXX
+BO_ 72 Transmission: 8 XXX
  SG_ Checksum : 0|8@1+ (1,0) [0|255] "" XXX
  SG_ Counter : 8|4@1+ (1,0) [0|15] "" XXX
- SG_ NEW_SIGNAL_3 : 40|16@1+ (1,0) [0|255] "" XXX
- SG_ NEW_SIGNAL_4 : 38|3@0+ (1,0) [0|255] "" XXX
  SG_ NEW_SIGNAL_5 : 16|8@1+ (1,0) [0|255] "" XXX
+ SG_ Gear : 24|8@1+ (1,0) [0|255] "" XXX
+ SG_ NEW_SIGNAL_4 : 38|3@0+ (1,0) [0|255] "" XXX
+ SG_ NEW_SIGNAL_3 : 40|16@1+ (1,0) [0|255] "" XXX
 
 BO_ 316 NEW_MSG_3: 8 XXX
 
@@ -98,28 +99,38 @@ BO_ 73 NEW_MSG_5: 8 XXX
  SG_ NEW_SIGNAL_1 : 32|8@1+ (1,0) [0|4095] "" XXX
  SG_ NEW_SIGNAL_2 : 24|8@1+ (1,0) [0|127] "" XXX
 
-BO_ 280 NEW_MSG_6: 8 XXX
+BO_ 280 STOP_START: 8 XXX
+ SG_ Checksum : 0|8@1+ (1,0) [0|1] "" XXX
+ SG_ Counter : 8|4@1+ (1,0) [0|1] "" XXX
  SG_ NEW_SIGNAL_1 : 12|12@1- (1,0) [0|4095] "" XXX
+ SG_ NEW_SIGNAL_4 : 40|4@1+ (1,0) [0|255] "" XXX
  SG_ NEW_SIGNAL_2 : 48|8@1- (1,0) [0|255] "" XXX
  SG_ NEW_SIGNAL_3 : 61|1@1+ (1,0) [0|7] "" XXX
- SG_ NEW_SIGNAL_4 : 40|4@1+ (1,0) [0|255] "" XXX
+ SG_ State : 63|1@1+ (1,0) [0|1] "" XXX
 
 BO_ 281 Steering_Torque: 8 XXX
  SG_ checksum : 0|8@1+ (1,0) [0|3] "" XXX
  SG_ counter : 8|4@1+ (1,0) [0|15] "" XXX
+ SG_ Steer_Error_1 : 12|1@0+ (1,0) [0|7] "" XXX
  SG_ Steer_Torque_Sensor : 16|11@1- (-1,0) [0|3] "" XXX
+ SG_ Steer_Error_2 : 28|1@1+ (1,0) [0|3] "" XXX
  SG_ Steering_Angle : 32|16@1- (-0.0217,0) [0|255] "" X
  SG_ Steer_Torque_Output : 48|11@1- (-1,0) [0|31] "" XXX
 
 BO_ 312 Brake_Pressure_L_R: 8 XXX
  SG_ Checksum : 0|8@1+ (1,0) [0|31] "" XXX
  SG_ Counter : 8|4@1+ (1,0) [0|3] "" XXX
- SG_ Brake_2 : 56|8@1+ (1,0) [0|255] "" XXX
  SG_ Brake_1 : 48|8@1+ (1,0) [0|255] "" XXX
+ SG_ Brake_2 : 56|8@1+ (1,0) [0|255] "" XXX
 
 BO_ 313 Brake_Pedal: 8 XXX
+ SG_ Checksum : 0|8@1+ (1,0) [0|1] "" XXX
+ SG_ Counter : 8|4@1+ (1,0) [0|1] "" XXX
+ SG_ Signal1 : 12|22@1+ (1,0) [0|1] "" XXX
  SG_ Brake_Pedal_On : 34|1@1+ (1,0) [0|7] "" XXX
+ SG_ Signal2 : 35|1@1+ (1,0) [0|1] "" XXX
  SG_ Brake_Pedal : 36|12@1+ (1,0) [0|65535] "" XXX
+ SG_ Signal3 : 48|16@1+ (1,0) [0|1] "" XXX
 
 BO_ 290 ES_LKAS: 8 XXX
  SG_ Checksum : 0|8@1+ (1,0) [0|255] "" XXX
@@ -138,18 +149,26 @@ BO_ 722 NEW_MSG_10: 8 XXX
 BO_ 544 ES_Brake: 8 XXX
  SG_ Checksum : 0|8@1+ (1,0) [0|255] "" XXX
  SG_ Counter : 8|4@1+ (1,0) [0|15] "" XXX
+ SG_ Signal1 : 12|4@1+ (1,0) [0|1] "" XXX
  SG_ Brake_Pressure : 16|16@1+ (1,0) [0|255] "" XXX
- SG_ __Status : 36|4@1+ (1,0) [0|63] "" XXX
+ SG_ Signal2 : 32|4@1+ (1,0) [0|1] "" XXX
+ SG_ State : 36|4@1+ (1,0) [0|63] "" XXX
+ SG_ Signal3 : 40|24@1+ (1,0) [0|1] "" XXX
 
 BO_ 545 ES_Distance: 8 XXX
  SG_ Checksum : 0|8@1+ (1,0) [0|255] "" XXX
  SG_ Counter : 8|4@1+ (1,0) [0|15] "" XXX
- SG_ Signal1 : 12|20@1+ (1,0) [0|15] "" XXX
- SG_ Signal2 : 32|24@1+ (1,0) [0|15] "" XXX
- SG_ ACC_Cancel : 56|1@1+ (1,0) [0|1] "" XXX
- SG_ ACC_Set : 57|1@1+ (1,0) [0|1] "" XXX
- SG_ ACC_Resume : 58|1@1+ (1,0) [0|1] "" XXX
- SG_ Signal3 : 59|5@1+ (1,0) [0|1] "" XXX
+ SG_ ES_Cruise_Throttle : 12|20@1+ (1,0) [0|15] "" XXX
+ SG_ Car_Follow : 32|1@1+ (1,0) [0|1] "" XXX
+ SG_ Signal1 : 33|4@1+ (1,0) [0|1] "" XXX
+ SG_ Distance_Swap : 37|1@1+ (1,0) [0|15] "" XXX
+ SG_ Signal2 : 38|2@1+ (1,0) [0|1] "" XXX
+ SG_ Close_Distance : 40|8@1+ (1,0) [0|1] "" XXX
+ SG_ Signal3 : 48|8@1+ (1,0) [0|1] "" XXX
+ SG_ Cruise_Cancel : 56|1@1+ (1,0) [0|1] "" XXX
+ SG_ Cruise_Set : 57|1@1+ (1,0) [0|1] "" XXX
+ SG_ Cruise_Resume : 58|1@1+ (1,0) [0|1] "" XXX
+ SG_ Signal4 : 59|5@1+ (1,0) [0|1] "" XXX
 
 BO_ 546 ES_Status: 8 XXX
  SG_ Checksum : 0|8@1+ (1,0) [0|255] "" XXX
@@ -157,6 +176,7 @@ BO_ 546 ES_Status: 8 XXX
  SG_ RPM : 16|12@1+ (1,0) [0|255] "" XXX
  SG_ Cruise_Activated : 29|1@0+ (1,0) [0|3] "" XXX
  SG_ Cruise_Brake : 30|1@1+ (1,0) [0|3] "" XXX
+ SG_ Cruise_Hold : 31|1@1+ (1,0) [0|1] "" XXX
 
 BO_ 554 ES_Blank: 8 XXX
  SG_ Checksum : 0|8@1+ (1,0) [0|255] "" XXX
@@ -194,28 +214,34 @@ BO_ 912 Dashlights: 8 XXX
  SG_ SEATBELT_FL : 48|1@1+ (1,0) [0|1] "" XXX
 
 BO_ 940 BodyInfo: 8 XXX
- SG_ DASH_BTN_LIGHTS : 56|1@0+ (1,0) [0|1] "" XXX
+ SG_ Checksum : 0|8@1+ (1,0) [0|1] "" XXX
+ SG_ Counter : 8|4@1+ (1,0) [0|1] "" XXX
  SG_ DOOR_OPEN_FL : 32|1@1+ (1,0) [0|255] "" XXX
  SG_ DOOR_OPEN_FR : 33|1@1+ (1,0) [0|3] "" XXX
  SG_ DOOR_OPEN_RL : 34|1@1+ (1,0) [0|1] "" XXX
  SG_ DOOR_OPEN_RR : 35|1@1+ (1,0) [0|1] "" XXX
  SG_ DOOR_OPEN_TRUNK : 36|1@0+ (1,0) [0|1] "" XXX
- SG_ FOG_LIGHTS2 : 60|1@1+ (1,0) [0|1] "" XXX
- SG_ Highbeam : 58|1@1+ (1,0) [0|1] "" XXX
+ SG_ DASH_BTN_LIGHTS : 56|1@0+ (1,0) [0|1] "" XXX
  SG_ Lowbeam : 57|1@1+ (1,0) [0|3] "" XXX
+ SG_ Highbeam : 58|1@1+ (1,0) [0|1] "" XXX
+ SG_ FOG_LIGHTS2 : 60|1@1+ (1,0) [0|1] "" XXX
+ SG_ WIPERS : 62|1@0+ (1,0) [0|1] "" XXX
 
 BO_ 801 ES_DashStatus: 8 XXX
  SG_ Checksum : 0|8@1+ (1,0) [0|255] "" XXX
  SG_ Counter : 8|4@1+ (1,0) [0|7] "" XXX
+ SG_ PCB_Off : 12|1@1+ (1,0) [0|1] "" XXX
+ SG_ LDW_Off : 13|1@1+ (1,0) [0|1] "" XXX
+ SG_ Cruise_Distance : 28|3@1+ (1,0) [0|3] "" XXX
+ SG_ Cruise_Disengaged : 35|1@1+ (1,0) [0|3] "" XXX
+ SG_ Cruise_Activated : 36|1@1+ (1,0) [0|3] "" XXX
+ SG_ Cruise_Set_Speed : 40|8@1+ (1,0) [0|255] "" XXX
+ SG_ Cruise_Fault : 48|1@1+ (1,0) [0|1] "" XXX
  SG_ NEW_SIGNAL_10 : 49|2@1+ (1,0) [0|3] "" XXX
  SG_ Brake_Pedal : 51|1@1+ (1,0) [0|3] "" XXX
- SG_ Cruise_Set_Speed : 40|8@1+ (1,0) [0|255] "" XXX
- SG_ Cruise_Activated : 36|1@1+ (1,0) [0|3] "" XXX
- SG_ Cruise_Disengaged : 35|1@1+ (1,0) [0|3] "" XXX
- SG_ Far_Distance : 56|4@1+ (1,0) [0|15] "" XXX
  SG_ Car_Follow : 52|1@1+ (1,0) [0|3] "" XXX
- SG_ ACC_Distance : 28|3@1+ (1,0) [0|3] "" XXX
- SG_ ACC_Hold : 60|4@1+ (1,0) [0|15] "" XXX
+ SG_ Far_Distance : 56|4@1+ (1,0) [0|15] "" XXX
+ SG_ Cruise_State : 60|4@1+ (1,0) [0|15] "" XXX
 
 BO_ 802 ES_LKAS_State: 8 XXX
  SG_ Checksum : 0|8@1+ (1,0) [0|255] "" XXX
@@ -237,9 +263,9 @@ BO_ 802 ES_LKAS_State: 8 XXX
  SG_ FCW_Cont_Beep : 32|1@1+ (1,0) [0|1] "" XXX
  SG_ FCW_Repeated_Beep : 33|1@1+ (1,0) [0|1] "" XXX
  SG_ Throttle_Management_Activated : 34|1@1+ (1,0) [0|1] "" XXX
+ SG_ Lead_Vehicle_Start_Alert : 35|1@1+ (1,0) [0|1] "" XXX
  SG_ Right_Depart : 36|1@1+ (1,0) [0|3] "" XXX
  SG_ Signal5 : 37|27@1+ (1,0) [0|1] "" XXX
- SG_ Vehicle_In_Front_Has_Moved : 35|1@1+ (1,0) [0|1] "" XXX
 
 BO_ 805 ES_NEW_MSG_22: 8 XXX
  SG_ Checksum : 0|8@1+ (1,0) [0|255] "" XXX
@@ -334,6 +360,7 @@ BO_ 1677 Dash_State: 8 XXX
  SG_ Counter : 8|4@1+ (1,0) [0|15] "" XXX
  SG_ NEW_SIGNAL_3 : 16|4@1+ (1,0) [0|15] "" XXX
  SG_ Units : 29|3@1+ (1,0) [0|7] "" XXX
+ SG_ Icy_Road_Warning : 20|1@1+ (1,0) [0|1] "" XXX
 
 BO_ 1743 NEW_MSG_41: 8 XXX
  SG_ Checksum : 0|8@1+ (1,0) [0|255] "" XXX
@@ -360,10 +387,15 @@ BO_ 1787 NEW_MSG_45: 8 XXX
 
 
 
-CM_ SG_ 940 FOG_LIGHTS2 "yellow fog light in the dash";
+CM_ SG_ 64 Throttle_Combo "Throttle Cruise + Pedal";
+CM_ SG_ 544 State "0 = ES disabled, 8 = ES enabled, 12, 13 = ES_Brake active";
+CM_ SG_ 545 ES_Cruise_Throttle "signal might be smaller, values do not correlate with Throttle:CruiseThrottle";
+CM_ SG_ 545 Distance_Swap "Switch from Close to Far distance";
 CM_ SG_ 940 Highbeam "01 = low beam, 11 = high beam";
-CM_ SG_ 801 ACC_Hold "0 = No Hold, 3 = Hold";
-CM_ SG_ 802 Vehicle_In_Front_Has_Moved "Crosstrek 2018 = car in front has moved";
+CM_ SG_ 940 FOG_LIGHTS2 "yellow fog light in the dash";
+CM_ SG_ 801 PCB_Off "Pre-Collision Braking";
+CM_ SG_ 801 Cruise_State "0 = Normal, 1 = Hold+User Brake, 2 = Ready, 3 = Hold";
 CM_ SG_ 805 NEW_SIGNAL_3 "always 3";
 CM_ SG_ 805 NEW_SIGNAL_4 "always 1";
 CM_ SG_ 1677 Units "1 = imperial, 6 = metric";
+VAL_ 72 Gear 2 "N" 3 "R" 4 "P" 121 "D" 137 "1" 145 "2" 153 "3" 161 "4" 169 "5" 177 "6" ;
diff --git a/subaru_global_2017.dbc b/subaru_global_2017.dbc
index 6da81f281c4556..d098837f99367e 100644
--- a/subaru_global_2017.dbc
+++ b/subaru_global_2017.dbc
@@ -63,12 +63,13 @@ BO_ 65 NEW_MSG_1: 8 XXX
  SG_ NEW_SIGNAL_6 : 48|8@1+ (1,0) [0|63] "" XXX
  SG_ NEW_SIGNAL_7 : 59|2@0+ (1,0) [0|255] "" XXX
 
-BO_ 72 NEW_MSG_2: 8 XXX
+BO_ 72 Transmission: 8 XXX
  SG_ Checksum : 0|8@1+ (1,0) [0|255] "" XXX
  SG_ Counter : 8|4@1+ (1,0) [0|15] "" XXX
- SG_ NEW_SIGNAL_3 : 40|16@1+ (1,0) [0|255] "" XXX
- SG_ NEW_SIGNAL_4 : 38|3@0+ (1,0) [0|255] "" XXX
  SG_ NEW_SIGNAL_5 : 16|8@1+ (1,0) [0|255] "" XXX
+ SG_ Gear : 24|8@1+ (1,0) [0|255] "" XXX
+ SG_ NEW_SIGNAL_4 : 38|3@0+ (1,0) [0|255] "" XXX
+ SG_ NEW_SIGNAL_3 : 40|16@1+ (1,0) [0|255] "" XXX
 
 BO_ 316 NEW_MSG_3: 8 XXX
 
@@ -196,28 +197,30 @@ BO_ 912 Dashlights: 8 XXX
  SG_ SEATBELT_FL : 48|1@1+ (1,0) [0|1] "" XXX
 
 BO_ 940 BodyInfo: 8 XXX
- SG_ DASH_BTN_LIGHTS : 56|1@0+ (1,0) [0|1] "" XXX
  SG_ DOOR_OPEN_FL : 32|1@1+ (1,0) [0|255] "" XXX
  SG_ DOOR_OPEN_FR : 33|1@1+ (1,0) [0|3] "" XXX
  SG_ DOOR_OPEN_RL : 34|1@1+ (1,0) [0|1] "" XXX
  SG_ DOOR_OPEN_RR : 35|1@1+ (1,0) [0|1] "" XXX
  SG_ DOOR_OPEN_TRUNK : 36|1@0+ (1,0) [0|1] "" XXX
- SG_ FOG_LIGHTS2 : 60|1@1+ (1,0) [0|1] "" XXX
- SG_ Highbeam : 58|1@1+ (1,0) [0|1] "" XXX
+ SG_ DASH_BTN_LIGHTS : 56|1@0+ (1,0) [0|1] "" XXX
  SG_ Lowbeam : 57|1@1+ (1,0) [0|3] "" XXX
+ SG_ Highbeam : 58|1@1+ (1,0) [0|1] "" XXX
+ SG_ FOG_LIGHTS2 : 60|1@1+ (1,0) [0|1] "" XXX
+ SG_ WIPERS : 62|1@0+ (1,0) [0|1] "" XXX
 
 BO_ 801 ES_DashStatus: 8 XXX
  SG_ Checksum : 0|8@1+ (1,0) [0|255] "" XXX
  SG_ Counter : 8|4@1+ (1,0) [0|7] "" XXX
- SG_ NEW_SIGNAL_9 : 60|4@1+ (1,0) [0|15] "" XXX
+ SG_ Cruise_Distance : 28|3@1+ (1,0) [0|3] "" XXX
+ SG_ Cruise_Disengaged : 35|1@1+ (1,0) [0|3] "" XXX
+ SG_ Cruise_Activated : 36|1@1+ (1,0) [0|3] "" XXX
+ SG_ Cruise_Set_Speed : 40|8@1+ (1,0) [0|255] "" XXX
+ SG_ Cruise_Fault : 48|1@1+ (1,0) [0|1] "" XXX
  SG_ NEW_SIGNAL_10 : 49|2@1+ (1,0) [0|3] "" XXX
  SG_ Brake_Pedal : 51|1@1+ (1,0) [0|3] "" XXX
- SG_ Cruise_Set_Speed : 40|8@1+ (1,0) [0|255] "" XXX
- SG_ Cruise_Activated : 36|1@1+ (1,0) [0|3] "" XXX
- SG_ Cruise_Disengaged : 35|1@1+ (1,0) [0|3] "" XXX
- SG_ Far_Distance : 56|4@1+ (1,0) [0|15] "" XXX
  SG_ Car_Follow : 52|1@1+ (1,0) [0|3] "" XXX
- SG_ ACC_Distance : 28|3@1+ (1,0) [0|3] "" XXX
+ SG_ Far_Distance : 56|4@1+ (1,0) [0|15] "" XXX
+ SG_ Cruise_State : 60|4@1+ (1,0) [0|15] "" XXX
 
 BO_ 802 ES_LKAS_State: 8 XXX
  SG_ Checksum : 0|8@1+ (1,0) [0|255] "" XXX
@@ -364,7 +367,9 @@ BO_ 1787 NEW_MSG_45: 8 XXX
 
 CM_ SG_ 940 FOG_LIGHTS2 "yellow fog light in the dash";
 CM_ SG_ 940 Highbeam "01 = low beam, 11 = high beam";
+CM_ SG_ 801 Cruise_State "0 = Normal, 3 = Hold";
 CM_ SG_ 802 Traffic_light_Ahead "Crosstrek 2018 = car in front has moved";
 CM_ SG_ 805 NEW_SIGNAL_3 "always 3";
 CM_ SG_ 805 NEW_SIGNAL_4 "always 1";
 CM_ SG_ 1677 Units "1 = imperial, 6 = metric";
+VAL_ 72 Gear 2 "N" 3 "R" 4 "P" 121 "D" 137 "1" 145 "2" 153 "3" 161 "4" 169 "5" 177 "6";
diff --git a/toyota_avalon_2017_pt_generated.dbc b/toyota_avalon_2017_pt_generated.dbc
index 4adc94870da568..9d39b290492804 100644
--- a/toyota_avalon_2017_pt_generated.dbc
+++ b/toyota_avalon_2017_pt_generated.dbc
@@ -96,7 +96,10 @@ BO_ 180 SPEED: 8 XXX
 
 BO_ 353 DSU_SPEED: 8 XXX
  SG_ FORWARD_SPEED : 15|16@0- (0.00390625,-30) [0|255] "kph" XXX
-
+ 
+BO_ 452 ENGINE_RPM: 8 CGW
+ SG_ RPM : 7|16@0- (0.78125,0) [0|0] "rpm" SCS
+ 
 BO_ 466 PCM_CRUISE: 8 XXX
  SG_ GAS_RELEASED : 4|1@0+ (1,0) [0|1] "" XXX
  SG_ CRUISE_ACTIVE : 5|1@0+ (1,0) [0|1] "" XXX
diff --git a/toyota_camry_hybrid_2018_pt_generated.dbc b/toyota_camry_hybrid_2018_pt_generated.dbc
index f60681a17a184d..0061feab7ed770 100644
--- a/toyota_camry_hybrid_2018_pt_generated.dbc
+++ b/toyota_camry_hybrid_2018_pt_generated.dbc
@@ -96,7 +96,10 @@ BO_ 180 SPEED: 8 XXX
 
 BO_ 353 DSU_SPEED: 8 XXX
  SG_ FORWARD_SPEED : 15|16@0- (0.00390625,-30) [0|255] "kph" XXX
-
+ 
+BO_ 452 ENGINE_RPM: 8 CGW
+ SG_ RPM : 7|16@0- (0.78125,0) [0|0] "rpm" SCS
+ 
 BO_ 466 PCM_CRUISE: 8 XXX
  SG_ GAS_RELEASED : 4|1@0+ (1,0) [0|1] "" XXX
  SG_ CRUISE_ACTIVE : 5|1@0+ (1,0) [0|1] "" XXX
diff --git a/toyota_corolla_2017_pt_generated.dbc b/toyota_corolla_2017_pt_generated.dbc
index 3ea7fe4dece593..f683e044cb9f45 100644
--- a/toyota_corolla_2017_pt_generated.dbc
+++ b/toyota_corolla_2017_pt_generated.dbc
@@ -96,7 +96,10 @@ BO_ 180 SPEED: 8 XXX
 
 BO_ 353 DSU_SPEED: 8 XXX
  SG_ FORWARD_SPEED : 15|16@0- (0.00390625,-30) [0|255] "kph" XXX
-
+ 
+BO_ 452 ENGINE_RPM: 8 CGW
+ SG_ RPM : 7|16@0- (0.78125,0) [0|0] "rpm" SCS
+ 
 BO_ 466 PCM_CRUISE: 8 XXX
  SG_ GAS_RELEASED : 4|1@0+ (1,0) [0|1] "" XXX
  SG_ CRUISE_ACTIVE : 5|1@0+ (1,0) [0|1] "" XXX
diff --git a/toyota_highlander_2017_pt_generated.dbc b/toyota_highlander_2017_pt_generated.dbc
index e7aa6b66801533..ec67f2722b70b0 100644
--- a/toyota_highlander_2017_pt_generated.dbc
+++ b/toyota_highlander_2017_pt_generated.dbc
@@ -96,7 +96,10 @@ BO_ 180 SPEED: 8 XXX
 
 BO_ 353 DSU_SPEED: 8 XXX
  SG_ FORWARD_SPEED : 15|16@0- (0.00390625,-30) [0|255] "kph" XXX
-
+ 
+BO_ 452 ENGINE_RPM: 8 CGW
+ SG_ RPM : 7|16@0- (0.78125,0) [0|0] "rpm" SCS
+ 
 BO_ 466 PCM_CRUISE: 8 XXX
  SG_ GAS_RELEASED : 4|1@0+ (1,0) [0|1] "" XXX
  SG_ CRUISE_ACTIVE : 5|1@0+ (1,0) [0|1] "" XXX
diff --git a/toyota_highlander_hybrid_2018_pt_generated.dbc b/toyota_highlander_hybrid_2018_pt_generated.dbc
index 0920a2bf0436cb..27290d1732ddd7 100644
--- a/toyota_highlander_hybrid_2018_pt_generated.dbc
+++ b/toyota_highlander_hybrid_2018_pt_generated.dbc
@@ -96,7 +96,10 @@ BO_ 180 SPEED: 8 XXX
 
 BO_ 353 DSU_SPEED: 8 XXX
  SG_ FORWARD_SPEED : 15|16@0- (0.00390625,-30) [0|255] "kph" XXX
-
+ 
+BO_ 452 ENGINE_RPM: 8 CGW
+ SG_ RPM : 7|16@0- (0.78125,0) [0|0] "rpm" SCS
+ 
 BO_ 466 PCM_CRUISE: 8 XXX
  SG_ GAS_RELEASED : 4|1@0+ (1,0) [0|1] "" XXX
  SG_ CRUISE_ACTIVE : 5|1@0+ (1,0) [0|1] "" XXX
diff --git a/toyota_nodsu_hybrid_pt_generated.dbc b/toyota_nodsu_hybrid_pt_generated.dbc
index 3b76797437c53f..9c9b548e4638ce 100644
--- a/toyota_nodsu_hybrid_pt_generated.dbc
+++ b/toyota_nodsu_hybrid_pt_generated.dbc
@@ -113,7 +113,10 @@ BO_ 180 SPEED: 8 XXX
 
 BO_ 353 DSU_SPEED: 8 XXX
  SG_ FORWARD_SPEED : 15|16@0- (0.00390625,-30) [0|255] "kph" XXX
-
+ 
+BO_ 452 ENGINE_RPM: 8 CGW
+ SG_ RPM : 7|16@0- (0.78125,0) [0|0] "rpm" SCS
+ 
 BO_ 466 PCM_CRUISE: 8 XXX
  SG_ GAS_RELEASED : 4|1@0+ (1,0) [0|1] "" XXX
  SG_ CRUISE_ACTIVE : 5|1@0+ (1,0) [0|1] "" XXX
diff --git a/toyota_nodsu_pt_generated.dbc b/toyota_nodsu_pt_generated.dbc
index 75e4115e8c46b5..76661d3a8f4ed3 100644
--- a/toyota_nodsu_pt_generated.dbc
+++ b/toyota_nodsu_pt_generated.dbc
@@ -113,7 +113,10 @@ BO_ 180 SPEED: 8 XXX
 
 BO_ 353 DSU_SPEED: 8 XXX
  SG_ FORWARD_SPEED : 15|16@0- (0.00390625,-30) [0|255] "kph" XXX
-
+ 
+BO_ 452 ENGINE_RPM: 8 CGW
+ SG_ RPM : 7|16@0- (0.78125,0) [0|0] "rpm" SCS
+ 
 BO_ 466 PCM_CRUISE: 8 XXX
  SG_ GAS_RELEASED : 4|1@0+ (1,0) [0|1] "" XXX
  SG_ CRUISE_ACTIVE : 5|1@0+ (1,0) [0|1] "" XXX
diff --git a/toyota_prius_2017_pt_generated.dbc b/toyota_prius_2017_pt_generated.dbc
index 2bd788e2d2105c..db481d56e53b49 100644
--- a/toyota_prius_2017_pt_generated.dbc
+++ b/toyota_prius_2017_pt_generated.dbc
@@ -96,7 +96,10 @@ BO_ 180 SPEED: 8 XXX
 
 BO_ 353 DSU_SPEED: 8 XXX
  SG_ FORWARD_SPEED : 15|16@0- (0.00390625,-30) [0|255] "kph" XXX
-
+ 
+BO_ 452 ENGINE_RPM: 8 CGW
+ SG_ RPM : 7|16@0- (0.78125,0) [0|0] "rpm" SCS
+ 
 BO_ 466 PCM_CRUISE: 8 XXX
  SG_ GAS_RELEASED : 4|1@0+ (1,0) [0|1] "" XXX
  SG_ CRUISE_ACTIVE : 5|1@0+ (1,0) [0|1] "" XXX
diff --git a/toyota_rav4_2017_pt_generated.dbc b/toyota_rav4_2017_pt_generated.dbc
index 89cf5b6987c518..82a0ff54398edd 100644
--- a/toyota_rav4_2017_pt_generated.dbc
+++ b/toyota_rav4_2017_pt_generated.dbc
@@ -96,7 +96,10 @@ BO_ 180 SPEED: 8 XXX
 
 BO_ 353 DSU_SPEED: 8 XXX
  SG_ FORWARD_SPEED : 15|16@0- (0.00390625,-30) [0|255] "kph" XXX
-
+ 
+BO_ 452 ENGINE_RPM: 8 CGW
+ SG_ RPM : 7|16@0- (0.78125,0) [0|0] "rpm" SCS
+ 
 BO_ 466 PCM_CRUISE: 8 XXX
  SG_ GAS_RELEASED : 4|1@0+ (1,0) [0|1] "" XXX
  SG_ CRUISE_ACTIVE : 5|1@0+ (1,0) [0|1] "" XXX
diff --git a/toyota_rav4_hybrid_2017_pt_generated.dbc b/toyota_rav4_hybrid_2017_pt_generated.dbc
index 9a50d42c2baa27..84e130c8d00539 100644
--- a/toyota_rav4_hybrid_2017_pt_generated.dbc
+++ b/toyota_rav4_hybrid_2017_pt_generated.dbc
@@ -96,7 +96,10 @@ BO_ 180 SPEED: 8 XXX
 
 BO_ 353 DSU_SPEED: 8 XXX
  SG_ FORWARD_SPEED : 15|16@0- (0.00390625,-30) [0|255] "kph" XXX
-
+ 
+BO_ 452 ENGINE_RPM: 8 CGW
+ SG_ RPM : 7|16@0- (0.78125,0) [0|0] "rpm" SCS
+ 
 BO_ 466 PCM_CRUISE: 8 XXX
  SG_ GAS_RELEASED : 4|1@0+ (1,0) [0|1] "" XXX
  SG_ CRUISE_ACTIVE : 5|1@0+ (1,0) [0|1] "" XXX
diff --git a/toyota_sienna_xle_2018_pt_generated.dbc b/toyota_sienna_xle_2018_pt_generated.dbc
index 8cd7374268a32b..48446ecb46f3e3 100644
--- a/toyota_sienna_xle_2018_pt_generated.dbc
+++ b/toyota_sienna_xle_2018_pt_generated.dbc
@@ -96,7 +96,10 @@ BO_ 180 SPEED: 8 XXX
 
 BO_ 353 DSU_SPEED: 8 XXX
  SG_ FORWARD_SPEED : 15|16@0- (0.00390625,-30) [0|255] "kph" XXX
-
+ 
+BO_ 452 ENGINE_RPM: 8 CGW
+ SG_ RPM : 7|16@0- (0.78125,0) [0|0] "rpm" SCS
+ 
 BO_ 466 PCM_CRUISE: 8 XXX
  SG_ GAS_RELEASED : 4|1@0+ (1,0) [0|1] "" XXX
  SG_ CRUISE_ACTIVE : 5|1@0+ (1,0) [0|1] "" XXX
diff --git a/vw_mqb_2010.dbc b/vw_mqb_2010.dbc
index 6db2a4fcfa1207..c542b31f4f6602 100644
--- a/vw_mqb_2010.dbc
+++ b/vw_mqb_2010.dbc
@@ -1254,9 +1254,26 @@ BO_ 695 RCTA_01: 8 XXX
  SG_ RCTA_01_BZ : 8|4@1+ (1,0) [0|15] "" XXX
  SG_ RCTA_01_CRC : 0|8@1+ (1,0) [0|255] "" XXX
 
-BO_ 783 SWA_01: 8 XXX
- SG_ SWA_01_BZ : 8|4@1+ (1,0) [0|15] "" XXX
- SG_ SWA_01_CRC : 0|8@1+ (1,0) [0|255] "" XXX
+BO_ 783 SWA_01: 8 Gateway_MQB
+ SG_ CHECKSUM : 0|8@1+ (1,0) [0|255] ""  Vector__XXX
+ SG_ COUNTER : 8|4@1+ (1,0) [0|15] ""  Vector__XXX
+ SG_ SWA_Anzeigen : 12|4@1+ (1,0) [0|15] ""  Kombi_D4
+ SG_ SWA_Blindheit_erkannt : 16|1@1+ (1,0) [0|1] ""  Vector__XXX
+ SG_ SWA_rel_Nichtverf : 17|1@1+ (1,0) [0|1] ""  Vector__XXX
+ SG_ SWA_rel_Fehler : 18|1@1+ (1,0) [0|1] ""  Vector__XXX
+ SG_ SWA_Sta_aktiv : 19|1@1+ (1,0) [0|1] ""  Vector__XXX
+ SG_ SWA_Sta_passiv : 20|1@1+ (1,0) [0|1] ""  Vector__XXX
+ SG_ SWA_Standziele_li : 24|1@1+ (1,0) [0|1] ""  Vector__XXX
+ SG_ SWA_Kolonne_li : 25|1@1+ (1,0) [0|1] ""  Vector__XXX
+ SG_ SWA_Infostufe_SWA_li : 26|1@1+ (1,0) [0|1] ""  Vector__XXX
+ SG_ SWA_Warnung_SWA_li : 27|1@1+ (1,0) [0|1] ""  Vector__XXX
+ SG_ SWA_Kolonne_mi : 33|1@1+ (1,0) [0|1] ""  Vector__XXX
+ SG_ SWA_Standziele_re : 40|1@1+ (1,0) [0|1] ""  Vector__XXX
+ SG_ SWA_Kolonne_re : 41|1@1+ (1,0) [0|1] ""  Vector__XXX
+ SG_ SWA_Infostufe_SWA_re : 42|1@1+ (1,0) [0|1] ""  Vector__XXX
+ SG_ SWA_Warnung_SWA_re : 43|1@1+ (1,0) [0|1] ""  Vector__XXX
+ SG_ SWA_Gischtzaehler : 48|7@1+ (1,0) [0|100] "Unit_PerCent"  Vector__XXX
+ SG_ SWA_KD_Fehler : 59|1@1+ (1,0) [0|1] ""  Vector__XXX
 
 BO_ 804 ACC_04: 8 XXX
  SG_ ACC_04_CRC : 0|8@1+ (1,0) [0|255] "" XXX