Adding waveform reconstruction
Merging