continued SPI rework