Made Keyboard work properly.