Wave on/off tweak again