diff --git a/index.js b/index.js
index 54e1f06..e047d95 100644
--- a/index.js
+++ b/index.js
@@ -215,20 +215,10 @@ Q.nfcall = function (fn, ...args) {
 	})
 }
 
-function timeoutHandle(e, deferred, overloadSafe) {
-	e.code = 'ETIMEDOUT'
-	if (overloadSafe) setImmediate(deferred.reject, e)
-	else deferred.reject(e)
-}
-
-Q.timeout = function (promise, ms, message = undefined, overloadSafe = true) {
+Q.timeoutExact = function (promise, ms, message = undefined, overloadSafe = true) {
 	const deferred = Q.defer()
 
-	const stackTraceLimit = Error.stackTraceLimit
-	Error.stackTraceLimit = 10
-	let e = new Error(message ? message : `Timed out after ${ms} ms`)
-	Error.stackTraceLimit = stackTraceLimit
-
+	const e = new Error(message ? message : `Timed out after ${ms} ms`)
 	let timeout
 
 	promise.then(deferred.resolve, deferred.reject).then(() => {
@@ -236,26 +226,143 @@ Q.timeout = function (promise, ms, message = undefined, overloadSafe = true) {
 	})
 
 	deferred.promise.cancel = () => {
-		try {
-			if (promise.cancel) promise.cancel()
-		} finally {
-			e = null
-			deferred.reject(new CancellationError())
-			clearTimeout(timeout)
-		}
+		if (promise.cancel) promise.cancel()
+		deferred.reject(new CancellationError())
 	}
 
 	deferred.promise.extend = (ms)=>{
 		if(timeout){
 			clearTimeout(timeout)
 		}
-		timeout = setTimeout(timeoutHandle, ms, e, deferred, overloadSafe)
+		timeout = setTimeout(() => {
+			e.code = 'ETIMEDOUT'
+			if (overloadSafe) setImmediate(deferred.reject, e)
+			else deferred.reject(e)
+		}, ms)
 	}
 	deferred.promise.extend(ms)
 
 	return deferred.promise
 }
 
+const EmptyTimer = function(){}
+EmptyTimer.time = Number.POSITIVE_INFINITY
+let nextTimer = EmptyTimer
+const timers = new Set()
+let nextTickTimer = null
+
+function addTimer(fn, ms){
+	const now = Date.now()
+	const timeToRun = now + ms
+	if(nextTimer.time > timeToRun){
+		nextTimer = fn
+		nextTimer.time = timeToRun
+
+		if(nextTickTimer === null) {
+			nextTickTimer = setTimeout(executeTimerTick, 25, now + 25)
+		}
+	}
+
+}
+
+function adjustTimer(fn, ms){
+	const now = Date.now()
+	fn.time = now + ms
+	if(nextTickTimer === fn){
+		for(const t in timers){
+			if(t.time < fn.time) {
+				nextTimer = t
+				clearTimeout(nextTickTimer)
+				timers.add(fn)
+				return
+			}	
+		}
+	}	
+}
+
+function clearTimer(fn){
+	if(nextTimer === fn){
+		nextTimer = EmptyTimer
+		for(const t of timers){	
+			// potentially the next tiemr
+			if(t.time < nextTimer.time){
+				nextTimer = t
+			}
+		}
+	} else {
+		timers.delete(fn)
+	}
+}
+
+function executeTimerTick(scheduled){
+	const now = Date.now()
+	const workingTime = (now + scheduled) / 2
+
+	if(nextTimer.time > workingTime){
+		if(nextTickTimer !== EmptyTimer){
+			nextTickTimer = setTimeout(executeTimerTick, 25, Math.min(now + 25, workingTime + 50))
+		} else {
+			nextTickTimer = null
+		}
+		return
+	}
+
+	// execute the next timer
+	setImmediate(nextTimer)
+	nextTimer = EmptyTimer
+
+	// find the next timer, execute any due timers
+	for(const t of timers){
+		// due for execution
+		if(t.time <= workingTime) {
+			setImmediate(t)
+			timers.delete(t)
+			continue
+		}
+
+		// potentially the next tiemr
+		if(t.time < nextTimer.time){
+			nextTimer = t
+		}
+	}
+
+	if(nextTimer !== EmptyTimer){
+		timers.delete(nextTimer)
+	
+		// schedule the next timer
+		nextTickTimer = setTimeout(executeTimerTick, 25, Math.min(now + 25, workingTime + 50))
+	} else {
+		nextTickTimer = null
+	}
+}
+
+Q.timeout = function (promise, ms, message = undefined) {
+	const deferred = Q.defer()
+
+	const e = new Error(message ? message : `Timed out after ${ms} ms`)
+	let timeout = () => {
+		e.code = 'ETIMEDOUT'
+		deferred.reject(e)
+	}
+
+	promise.then(deferred.resolve, deferred.reject).then(() => {
+		clearTimer(timeout)
+	})
+
+	deferred.promise.cancel = () => {
+		if (promise.cancel) promise.cancel()
+		deferred.reject(new CancellationError())
+	}
+
+	deferred.promise.extend = (ms)=>{
+		adjustTimer(timeout, ms)
+	}
+
+	addTimer(timeout, ms)
+
+	return deferred.promise
+}
+
 Q.timewarn = async function (promise, ms, fn, message = undefined) {
 	let ex = new Error(message ? message : `Timed out after ${ms} ms`)
     async function doCall() {
@@ -266,12 +373,12 @@ Q.timewarn = async function (promise, ms, fn, message = undefined) {
 		const requeue = await fn(ex)
         if(requeue){
 			if(!ex) return
-			timeout = setTimeout(doCall, Number.isInteger(requeue) ? requeue : ms)
+			addTimer(doCall, Number.isInteger(requeue) ? requeue : ms)
 		}
     }
-    let timeout = setTimeout(doCall, ms)
+    addTimer(doCall, ms)
     function doClear(v){
-        clearTimeout(timeout)
+        clearTimer(doCall)
 		ex = null
 		return v
     }
@@ -283,17 +390,19 @@ Q.timewarn = async function (promise, ms, fn, message = undefined) {
     return await promise.then(doClear, doClearEx)
 }
 
-Q.deferredTimeout = function (deferred, ms, symbol = undefined, overloadSafe = true) {
+Q.deferredTimeout = function (deferred, ms, symbol = undefined) {
 	if (!symbol) {
 		symbol = new Error(`Timed out after ${ms} ms`)
 	}
-	const timer = setTimeout(() => {
-		if (overloadSafe) setImmediate(deferred.reject, symbol)
-		else deferred.reject(symbol)
-	}, ms)
+
+	const fn = () => {
+		deferred.reject(symbol)
+	}
+
+	addTimer(fn, ms)
 
 	deferred.promise.catch(() => { }).then(() => {
-		clearTimeout(timer)
+		clearTimer(fn)
 	})
 
 	return deferred.promise