I don't think it's ok to change the SPI in the CR stage, we should leave the method names as they are for now.