WHIRR-693 (add waves)