Update PN waveform modes to be consistent with paper