Updated to keypress