Made changes to enable waveform reading.