Updated to use new Gesture Recognizer