Also handling the timeout on keypress events
Rebuilt