diff --git a/BuboQuark.quark b/BuboQuark.quark
index e378bff..2b3639d 100644
--- a/BuboQuark.quark
+++ b/BuboQuark.quark
@@ -13,6 +13,7 @@
     "https://github.com/scztt/Require.quark",
     "https://github.com/dmorgan-github/Pdv",
     "https://github.com/supercollider-quarks/Bjorklund",
+    "https://github.com/adcxyz/SafetyNet",
   ],
 	url:       "https://raphaelforment.fr",
 	isCompatible: {Main.versionAtLeast(3, 1)},
diff --git a/Classes/BuboBoot.sc b/Classes/BuboBoot.sc
index f19adbc..9641adb 100644
--- a/Classes/BuboBoot.sc
+++ b/Classes/BuboBoot.sc
@@ -46,7 +46,7 @@ Boot {
     Server.default.waitForBoot({
       "-> Loading config from: %".format(configPath ? (this.localPath +/+ "Startup.scd")).postln;
       (configPath ? (this.localPath +/+ "Startup.scd")).load;
-      StageLimiter.activate;
+      // StageLimiter.activate; // NOTE: replaced by SafetyNet
       this.fancyPrint(ready, 40);
       this.installServerTreeBehavior();
       this.clock.enableMeterSync();
diff --git a/Classes/Configuration/Synthdefs.scd b/Classes/Configuration/Synthdefs.scd
index 0788419..68f9b0a 100644
--- a/Classes/Configuration/Synthdefs.scd
+++ b/Classes/Configuration/Synthdefs.scd
@@ -13,11 +13,12 @@ f.vardel = {
 };
 
 (
-  z = SynthDef.new(\sampler, {
-  	arg buf, out=0, freq=440, rate=1, amp=1, pan=0, attack=0.01, release=1, loop=0;
+  z = SynthDef.new(\s, {
+  	arg buf, out=0, freq=440, rate=1, amp=1, begin=0, end=1, pan=0, attack=0.01, release=1, loop=0;
   	var sig;
     var env = EnvGen.ar(Env.perc(attack, release, doneAction: 2));
-    var startPos = 0;
+    var startPos = begin * BufFrames.kr(buf);
+    var endPos = end * BufFrames.kr(buf); // TODO: unused
     sig = PlayBuf.ar(
       numChannels: 1,
       bufnum: buf,
@@ -28,7 +29,7 @@ f.vardel = {
   	sig = Pan2.ar(sig * env, pan);
     OffsetOut.ar(out, sig)
   }).add;
-  d.sampler = z;
+  d.s = z;
 );
 
 (