Waves now working