Did same thing for KeyPress also