CC-2301 : updating waveform code for states