Tweaked driver implementation