Updated how live and recorded spikes are handled