Adding touch support (take 1).