Updated to handle single touch events