Waves a bit better