added touch, change namespace