Update for Wavetronix use