Updated touch management (broken with debugging output)