improve waveform scan tool