updated datapath and waveforms