diff --git a/FW/leo_muziekdoos_esp32/src/rfid.cpp b/FW/leo_muziekdoos_esp32/src/rfid.cpp
index afd925b..74a0e64 100644
--- a/FW/leo_muziekdoos_esp32/src/rfid.cpp
+++ b/FW/leo_muziekdoos_esp32/src/rfid.cpp
@@ -1,44 +1,26 @@
 #include "rfid.h"
 
-uint8_t cardsToCheck[] = {TRACK_NFCTYPE1,
-                          TRACK_NFCTYPE2,
-                          TRACK_NFCTYPE3,
-                          TRACK_NFCTYPE4A,
-                          TRACK_NFCTYPE4B,
-                          TRACK_NFCTYPE5};
 
-uint8_t currentCardIdx = 0;
-uint8_t maxCardIdx = sizeof(cardsToCheck);
-
-uint32_t last_rfid_update = 0;
-//CR95HF reader(NFC_SS, NFC_SCK, NFC_MOSI, NFC_MISO, NFC_IRQ);
+PN532_SPI pn532spi(SPI, NFC_SS, NFC_SCK, NFC_MISO, NFC_MOSI);
+NfcAdapter nfc = NfcAdapter(pn532spi);
 
 //*****************************************************************************************//
 void initRfid()
 {
-  Serial.println(F("rfid init")); //shows in serial that it is ready to read
-
   //int8_t sck=-1, int8_t miso=-1, int8_t mosi=-1, int8_t ss=-1);
-  ConfigManager_HWInit(NFC_SCK, NFC_MISO, NFC_MOSI, NFC_SS, NFC_IRQ);
-  //reader.begin();
+  nfc.begin(true);
   Serial.println(F("rfid init done")); //shows in serial that it is ready to read
 }
 
 //*****************************************************************************************//
 void handleRfid()
 {
-  uint32_t timeNow = millis();
-
-  if (timeNow - last_rfid_update > RFIDINTERVAL)
+  if (nfc.tagPresent())
   {
-    Serial.printf("rfid: reading card type index %d\n",currentCardIdx);
-    uint8_t TagType = ConfigManager_TagHunting(cardsToCheck[currentCardIdx++]);
-    if(currentCardIdx > maxCardIdx)
-    {
-      currentCardIdx = 0;
-    }
-    Serial.printf("rfid: read card returned %d\n",TagType);
-    last_rfid_update = timeNow;
+    NfcTag tag = nfc.read();
+    String uid = tag.getUidString();
+    Serial.println(uid);
   }
 }
 //*****************************************************************************************//
+
diff --git a/FW/leo_muziekdoos_esp32/src/rfid.h b/FW/leo_muziekdoos_esp32/src/rfid.h
index a7b709a..3467247 100644
--- a/FW/leo_muziekdoos_esp32/src/rfid.h
+++ b/FW/leo_muziekdoos_esp32/src/rfid.h
@@ -1,24 +1,13 @@
 #pragma once
 
 #include "board.h"
-#include "Arduino.h"
-#include "SerialDebug.h"
-#include "lib_NDEF_URI.h"
-#include "lib_NDEF_SMS.h"
-#include "lib_NDEF_Text.h"
-#include "lib_NDEF_Email.h"
-#include "lib_NDEF_Geo.h"
-#include "lib_95HFConfigManager.h"
-#include "miscellaneous.h"
-#include "lib_95HFConfigManager.h"
-#include "lib_wrapper.h"
-#include "lib_NDEF_URI.h"
-#include "drv_spi.h"
 
-//#include "CR95HF.h"
-
-#define RFIDINTERVAL 200
+#include <SPI.h>
+#include "PN532_SPI.h"
+#include "PN532.h"
+#include "NfcAdapter.h"
 
+#define NDEF_SUPPORT_MIFARE_CLASSIC
 
 void initRfid(void);
 void handleRfid(void);
\ No newline at end of file