Waves complete v9.6 r2r