MODIFIED: KeyboardHandler Updated