Updated to include gestures