Update

More effective overriding of keyboard control