Finally! WaveUpdater works!