added touch devices support