Tweak output wave definitions for better drag-to-set