The touch handler has been refactored