Small change for key events