Update for Wavetronix use.