:gb: Refined drawWave method