WIP: update transfer waveform for the new streams