Change to support key press