diff --git a/packages/superdough/helpers.mjs b/packages/superdough/helpers.mjs
index f28fcfae..15c81522 100644
--- a/packages/superdough/helpers.mjs
+++ b/packages/superdough/helpers.mjs
@@ -66,15 +66,15 @@ export const getADSR = (attack, decay, sustain, release, velocity, begin, end) =
   return gainNode;
 };
 
-export const getParamADSR = (param, attack, decay, sustain, release, velocity, begin, end) => {
+export const getParamADSR = (param, attack, decay, sustain, release, max, begin, end) => {
   param.setValueAtTime(0, begin);
-  param.linearRampToValueAtTime(velocity, begin + attack);
-  param.linearRampToValueAtTime(sustain * velocity, begin + attack + decay);
-  param.setValueAtTime(sustain * velocity, end);
-  param.linearRampToValueAtTime(0, end + release - 0.1);
+  param.linearRampToValueAtTime(max, begin + attack);
+  param.linearRampToValueAtTime(sustain * max, begin + attack + decay);
+  param.setValueAtTime(sustain * max, end);
+  param.linearRampToValueAtTime(0, end + release);
 };
 
-export function createFilter(context, type, frequency, Q, attack, decay, sustain, release, fenv, t) {
+export function createFilter(context, type, frequency, Q, attack, decay, sustain, release, fenv, start, end) {
   const filter = context.createBiquadFilter();
   filter.type = type;
   filter.frequency.value = frequency;
@@ -89,8 +89,8 @@ export function createFilter(context, type, frequency, Q, attack, decay, sustain
       sustain,
       release,
       frequency * fenv > 22000 ? 22000 : frequency * fenv,
-      t,
-      t + attack + decay + release,
+      start,
+      end + release,
     );
     return filter;
   }
diff --git a/packages/superdough/superdough.mjs b/packages/superdough/superdough.mjs
index 8e4a0148..cddddbb4 100644
--- a/packages/superdough/superdough.mjs
+++ b/packages/superdough/superdough.mjs
@@ -201,10 +201,6 @@ export const superdough = async (value, deadline, hapDuration) => {
     bpsustain = 0.6,
     bprelease = 0.01,
     bandq = 1,
-    // full adsr for filter
-    lpadsr,
-    hpadsr,
-    bpadsr,
     //
     coarse,
     crush,
@@ -229,9 +225,6 @@ export const superdough = async (value, deadline, hapDuration) => {
   if (bank && s) {
     s = `${bank}_${s}`;
   }
-  lpadsr && (lpattack = lpadsr[0]) && (lpdecay = lpadsr[1]) && (lpsustain = lpadsr[2]) && (lprelease = lpadsr[3]);
-  hpadsr && (hpattack = hpadsr[0]) && (hpdecay = hpadsr[1]) && (hpsustain = hpadsr[2]) && (hprelease = hpadsr[3]);
-  bpadsr && (bpattack = bpadsr[0]) && (bpdecay = bpadsr[1]) && (bpsustain = bpadsr[2]) && (bprelease = bpadsr[3]);
   // get source AudioNode
   let sourceNode;
   if (source) {
@@ -262,19 +255,18 @@ export const superdough = async (value, deadline, hapDuration) => {
   chain.push(gainNode(gain));
 
   if (cutoff !== undefined) {
-    const filter1 = createFilter(ac, 'lowpass', cutoff, resonance, lpattack, lpdecay, lpsustain, lprelease, fenv, t);
-    chain.push(filter1);
+    console.log('lpattack', lpattack);
+    let lp = () =>
+      createFilter(ac, 'lowpass', cutoff, resonance, lpattack, lpdecay, lpsustain, lprelease, fenv, t, t + hapDuration);
+    chain.push(lp());
     if (order === '24db') {
-      const filter2 = createFilter(ac, 'lowpass', cutoff, resonance, lpattack, lpdecay, lpsustain, lprelease, fenv, t);
-      chain.push(filter2);
+      chain.push(lp());
     }
   }
 
   if (hcutoff !== undefined) {
-    const filter1 = createFilter(ac, 'highpass', hcutoff, hresonance, hpattack, hpdecay, hpsustain, hprelease, fenv, t);
-    chain.push(filter1);
-    if (order === '24db') {
-      const filter2 = createFilter(
+    let hp = () =>
+      createFilter(
         ac,
         'highpass',
         hcutoff,
@@ -285,17 +277,20 @@ export const superdough = async (value, deadline, hapDuration) => {
         hprelease,
         fenv,
         t,
+        t + hapDuration,
       );
-      chain.push(filter2);
+    chain.push(hp());
+    if (order === '24db') {
+      chain.push(hp());
     }
   }
 
   if (bandf !== undefined) {
-    const filter1 = createFilter(ac, 'bandpass', bandf, bandq, bpattack, bpdecay, bpsustain, bprelease, fenv, t);
-    chain.push(filter1);
+    let bp = () =>
+      createFilter(ac, 'bandpass', bandf, bandq, bpattack, bpdecay, bpsustain, bprelease, fenv, t, t + hapDuration);
+    chain.push(bp());
     if (order === '24db') {
-      const filter2 = createFilter(ac, 'bandpass', bandf, bandq, bpattack, bpdecay, bpsustain, bprelease, fenv, t);
-      chain.push(filter2);
+      chain.push(bp());
     }
   }