Added better keyboard input