Updated to work with keyboard
Updated to included working keyboard