Change and simplifications for single spike-in which will be with-in alignment.