Improved gestures tracking