Keyboard is working, some performance improvement