Added Damian Beresford's code to pass along debug info to tap