Added touch, getting things working properly in debug mode again