Finishing up timedomain waveform extraction