SPI reorganized, RFID corrected