Updated touch functionality