Integrated the new touch listener