Waves now work as properly