diff --git a/c_os/user/HeapDemo.cc b/c_os/user/HeapDemo.cc
index ce9561e..29dc195 100755
--- a/c_os/user/HeapDemo.cc
+++ b/c_os/user/HeapDemo.cc
@@ -11,19 +11,9 @@
 #include "user/HeapDemo.h"
 #include "kernel/Allocator.h"
 #include "kernel/Globals.h"
+#include "lib/Input.h"
 #include "user/MyObj.h"
 
-// Hilfsfunktion: Auf Return-Taste warten
-void waitForReturn() {
-
-    /* hier muss Code eingefuegt werden */
-
-    Key key;
-    do {
-        key = kb.key_hit();
-    } while ((char)key != '\n');
-}
-
 void heap_demo() {
     kout << "HEAP_DEMO ===================================================================" << endl;
 
diff --git a/c_os/user/KeyboardDemo.cc b/c_os/user/KeyboardDemo.cc
index 0f455ef..e9fd311 100755
--- a/c_os/user/KeyboardDemo.cc
+++ b/c_os/user/KeyboardDemo.cc
@@ -9,6 +9,7 @@
  *****************************************************************************/
 
 #include "kernel/Globals.h"
+#include "lib/Input.h"
 
 void keyboard_demo() {
 
@@ -17,7 +18,7 @@ void keyboard_demo() {
     kout << "Keyboard Demo: " << endl;
 
     while (true) {
-        kout << kb.key_hit();
+        kout << getch();
         kout.flush();
     }
 }