v2.2.0 — Add touch detection, optimisations