Update to valid component with waveforms