Updated touch click implementation