Added proper waves