modified driver for speed / debugging purposes