diff --git a/software/main/include/can_data.h b/software/main/include/can_data.h
index bb2db90..a052247 100644
--- a/software/main/include/can_data.h
+++ b/software/main/include/can_data.h
@@ -62,12 +62,8 @@ namespace can {
 
 	#pragma pack(1)
 	struct Volume {
-		uint8_t _upper : 3;
 		uint8_t volume : 5;
-
-		bool scrolled() {
-			return _upper == 0b000;
-		}
+		uint8_t _1 : 3;
 	};
 	#pragma pack()
 }
diff --git a/software/main/src/avrcp.cpp b/software/main/src/avrcp.cpp
index 2639c8b..154bd0e 100644
--- a/software/main/src/avrcp.cpp
+++ b/software/main/src/avrcp.cpp
@@ -178,8 +178,14 @@ void avrcp::backward() {
 }
 
 void avrcp::set_volume(uint8_t v) {
+	// Make sure the volume is actually changed
+	if (v == volume) {
+		return;
+	}
+
 	set_volume_value(v);
 
+	// @TODO What we the device supports remote volume but we can not send it yet?
 	if (volume_notify) {
 		ESP_LOGI(AVRCP_TAG, "Setting remote volume value to %i", v);
 		esp_avrc_rn_param_t rn_param;
diff --git a/software/main/src/can.cpp b/software/main/src/can.cpp
index eb02245..d355a8a 100644
--- a/software/main/src/can.cpp
+++ b/software/main/src/can.cpp
@@ -324,10 +324,10 @@ static void read_can_msg(spi_device_handle_t spi, uint8_t buffer_load_addr, unsi
 	{
 		spi_transaction_t t;
 		memset(&t, 0, sizeof(t));
-		t.length = 8*5;
-		uint8_t data[5];
+		t.length = 8*(5 + 8);
+		uint8_t data[5 + 8];
 		t.rx_buffer = data;
-		t.flags = SPI_TRANS_CS_KEEP_ACTIVE;
+		/* t.flags = SPI_TRANS_CS_KEEP_ACTIVE; */
 
 		ret = spi_device_polling_transmit(spi, &t);
 		ESP_ERROR_CHECK(ret);
@@ -347,18 +347,23 @@ static void read_can_msg(spi_device_handle_t spi, uint8_t buffer_load_addr, unsi
 
 		// @TODO Do we need this in our application
 		*rtr_bit = (data[0] & MCP_RTR_MASK) ? 1 : 0;
+
+		// Copy the data into the buffer
+		for (int i = 0; i < *len; ++i) {
+			buf[i] = data[5 + i];
+		}
 	}
 
 	// Read the data
-	{
-		spi_transaction_t t;
-		memset(&t, 0, sizeof(t));
-		t.length = 8*(*len);
-		t.rx_buffer = buf;
+	/* { */
+	/* 	spi_transaction_t t; */
+	/* 	memset(&t, 0, sizeof(t)); */
+	/* 	t.length = 8*(*len); */
+	/* 	t.rx_buffer = buf; */
 
-		ret = spi_device_polling_transmit(spi, &t);
-		ESP_ERROR_CHECK(ret);
-	}
+	/* 	ret = spi_device_polling_transmit(spi, &t); */
+	/* 	ESP_ERROR_CHECK(ret); */
+	/* } */
 
 	// Make sure we release the bus
 	spi_device_release_bus(spi);
@@ -471,9 +476,7 @@ static void read_message(spi_device_handle_t spi) {
 		button_backward.tick(buttons.backward);
 	} else if (id == VOLUME_ID) {
 		can::Volume volume = *(can::Volume*)buf;
-		if (volume.scrolled()) {
-			avrcp::set_volume(ceil(volume.volume * 4.2f));
-		}
+		avrcp::set_volume(ceil(volume.volume * 4.2f));
 	}
 }
 
@@ -504,7 +507,7 @@ void can::init() {
 	ESP_LOGI(CAN_TAG, "Adding device");
 	spi_device_interface_config_t devcfg = {
 		.mode=0,
-		.clock_speed_hz=10*1000*1000,
+		.clock_speed_hz=20*1000*1000,
 		.spics_io_num=PIN_NUM_CS,
 		.queue_size=7,
 	};
@@ -540,9 +543,12 @@ void can::init() {
 	write_id(*spi, MCP_RXM1SIDH, 0, 0x3ff);
 
 	ESP_LOGI(CAN_TAG, "Init filter");
-	/* write_id(*spi, MCP_RXF0SIDH, 0, 0x165); */
-	write_id(*spi, MCP_RXF1SIDH, 0, 0x1a5);
-	write_id(*spi, MCP_RXF1SIDH, 0, 0x21f);
+	// @TODO WATCH OUT FOR ADDRESS
+	/* write_id(*spi, MCP_RXF0SIDH, 0, RADIO_ID); */
+	/* write_id(*spi, MCP_RXF0SIDH, 0, VOLUME_ID); */
+	write_id(*spi, MCP_RXF1SIDH, 0, BUTTONS_ID);
+
+	write_id(*spi, MCP_RXF0SIDH, 0, 0);
 
 	ESP_LOGI(CAN_TAG, "Enter normal mode");
 	set_CANCTRL_mode(*spi, MODE_NORMAL);
diff --git a/software/main/src/helper.cpp b/software/main/src/helper.cpp
index 4133f5f..66b6e3b 100644
--- a/software/main/src/helper.cpp
+++ b/software/main/src/helper.cpp
@@ -15,6 +15,7 @@ const char* connection_state_to_str(esp_a2d_connection_state_t state) {
 
 MultiPurposeButton::MultiPurposeButton(void(*short_press)(), void(*long_press)(), uint8_t threshold) : short_press(short_press), long_press(long_press), threshold(threshold) {}
 
+// @TOOD Use a timer instead of amount of updates as this can be inconsistent (e.g. when in eco mode)
 void MultiPurposeButton::tick(bool current) {
 	if (current && !acted) {
 		if (counter >= threshold) {
diff --git a/software/main/src/main.cpp b/software/main/src/main.cpp
index bf0a388..d67ef7d 100644
--- a/software/main/src/main.cpp
+++ b/software/main/src/main.cpp
@@ -45,6 +45,6 @@ extern "C" void app_main() {
 
 	/* xTaskCreate(task, "Task", 2048, nullptr, 0, nullptr); */
 
-	/* can::init(); */
+	can::init();
 }