Added controller and gesture recognition