Change to use new SPI