update with working touch handlers