added touch conditions