diff --git a/components/jujiboutils/examples/example1/main.lfm b/components/jujiboutils/examples/example1/main.lfm
index 209111f1e..b25d107a2 100644
--- a/components/jujiboutils/examples/example1/main.lfm
+++ b/components/jujiboutils/examples/example1/main.lfm
@@ -1,11 +1,11 @@
 object Form1: TForm1
-  Left = 379
-  Height = 340
-  Top = 214
-  Width = 411
+  Left = 307
+  Height = 331
+  Top = 233
+  Width = 436
   Caption = 'Form1'
-  ClientHeight = 340
-  ClientWidth = 411
+  ClientHeight = 331
+  ClientWidth = 436
   OnCreate = FormCreate
   LCLVersion = '1.1'
   object Label1: TLabel
@@ -35,9 +35,9 @@ object Form1: TForm1
     TabOrder = 4
   end
   object BitBtn1: TBitBtn
-    Left = 318
+    Left = 343
     Height = 30
-    Top = 297
+    Top = 288
     Width = 77
     Anchors = [akRight, akBottom]
     Caption = '&Cerrar'
@@ -46,7 +46,7 @@ object Form1: TForm1
     TabOrder = 5
   end
   object JDBLabeledCurrencyEdit1: TJDBLabeledCurrencyEdit
-    Left = 300
+    Left = 298
     Height = 27
     Top = 173
     Width = 80
@@ -59,7 +59,7 @@ object Form1: TForm1
     EditLabel.AnchorSideRight.Control = JDBLabeledCurrencyEdit1
     EditLabel.AnchorSideRight.Side = asrBottom
     EditLabel.AnchorSideBottom.Control = JDBLabeledCurrencyEdit1
-    EditLabel.Left = 300
+    EditLabel.Left = 298
     EditLabel.Height = 17
     EditLabel.Top = 153
     EditLabel.Width = 80
@@ -90,6 +90,7 @@ object Form1: TForm1
   object JDBLabeledDateEdit1: TJDBLabeledDateEdit
     Left = 106
     Height = 27
+    Hint = 'Try Alt+Down arrow key to show the calendar'
     Top = 173
     Width = 80
     DataField = 'DATE'
@@ -105,10 +106,12 @@ object Form1: TForm1
     EditLabel.Width = 80
     EditLabel.Caption = 'Date'
     EditLabel.ParentColor = False
+    ParentShowHint = False
+    ShowHint = True
     TabOrder = 1
   end
   object JDBLabeledIntegerEdit2: TJDBLabeledIntegerEdit
-    Left = 216
+    Left = 214
     Height = 27
     Top = 173
     Width = 80
@@ -119,7 +122,7 @@ object Form1: TForm1
     EditLabel.AnchorSideRight.Control = JDBLabeledIntegerEdit2
     EditLabel.AnchorSideRight.Side = asrBottom
     EditLabel.AnchorSideBottom.Control = JDBLabeledIntegerEdit2
-    EditLabel.Left = 216
+    EditLabel.Left = 214
     EditLabel.Height = 17
     EditLabel.Top = 153
     EditLabel.Width = 80
@@ -128,38 +131,13 @@ object Form1: TForm1
     TabOrder = 2
   end
   object Datasource1: TDatasource
-    DataSet = MemDataset1
-    left = 224
+    DataSet = BufDataset1
+    left = 336
     top = 8
   end
-  object MemDataset1: TMemDataset
-    Active = True
-    FieldDefs = <    
-      item
-        Name = 'ID'
-        DataType = ftInteger
-        Precision = 0
-        Size = 0
-      end    
-      item
-        Name = 'DATE'
-        DataType = ftDate
-        Precision = 0
-        Size = 0
-      end    
-      item
-        Name = 'TOTAL'
-        DataType = ftFloat
-        Precision = 0
-        Size = 0
-      end    
-      item
-        Name = 'ID2'
-        DataType = ftInteger
-        Precision = 0
-        Size = 0
-      end>
-    left = 184
+  object BufDataset1: TBufDataset
+    FieldDefs = <>
+    left = 248
     top = 8
   end
 end
diff --git a/components/jujiboutils/examples/example1/main.pas b/components/jujiboutils/examples/example1/main.pas
index 0f212f692..6896035ed 100644
--- a/components/jujiboutils/examples/example1/main.pas
+++ b/components/jujiboutils/examples/example1/main.pas
@@ -5,9 +5,9 @@ unit main;
 interface
 
 uses
-  Classes, SysUtils, DB, memds, FileUtil, Forms, Controls, Graphics, Dialogs,
-  StdCtrls, DBCtrls, Buttons, jdblabeledcurrencyedit, jdblabeledintegeredit,
-  jdblabeleddateedit;
+  Classes, SysUtils, DB, BufDataset, FileUtil, Forms, Controls, Graphics,
+  Dialogs, StdCtrls, DBCtrls, Buttons, jdblabeledcurrencyedit,
+  jdblabeledintegeredit, jdblabeleddateedit;
 
 type
 
@@ -15,6 +15,7 @@ type
 
   TForm1 = class(TForm)
     BitBtn1: TBitBtn;
+    BufDataset1: TBufDataset;
     Datasource1: TDatasource;
     DBNavigator1: TDBNavigator;
     JDBLabeledCurrencyEdit1: TJDBLabeledCurrencyEdit;
@@ -24,7 +25,6 @@ type
     Label1: TLabel;
     Label4: TLabel;
     Label5: TLabel;
-    MemDataset1: TMemDataset;
     procedure FormCreate(Sender: TObject);
   private
     { private declarations }
@@ -45,17 +45,26 @@ procedure TForm1.FormCreate(Sender: TObject);
 var
   i: integer;
 begin
+  // Create BufDataset
+  with BufDataset1.FieldDefs do
+  begin
+    Add('ID', ftInteger, 0, False);
+    Add('DATE', ftDate, 0, False);
+    Add('TOTAL', ftCurrency, 0, False);
+    Add('ID2', ftInteger, 0, False);
+  end;
+  BufDataset1.CreateDataset;
   // populate the memDataset
   for i := 1 to 10 do
   begin
-    MemDataset1.Append;
-    MemDataset1.FieldByName('ID').AsInteger := i;
-    MemDataset1.FieldByName('DATE').AsDateTime := Now;
-    MemDataset1.FieldByName('ID2').AsInteger := i * i;
-    MemDataset1.FieldByName('TOTAL').AsFloat := i * i * i;
-    MemDataset1.Post;
+    BufDataset1.Append;
+    BufDataset1.FieldByName('ID').AsInteger := i;
+    BufDataset1.FieldByName('DATE').AsDateTime := Now;
+    BufDataset1.FieldByName('ID2').AsInteger := i * i;
+    BufDataset1.FieldByName('TOTAL').AsCurrency := i * i * i;
+    BufDataset1.Post;
   end;
-  MemDataset1.First;
+  BufDataset1.First;
 end;
 
 end.
diff --git a/components/jujiboutils/examples/example1/project1.lpi b/components/jujiboutils/examples/example1/project1.lpi
index 02b3d5952..e2cd65be8 100644
--- a/components/jujiboutils/examples/example1/project1.lpi
+++ b/components/jujiboutils/examples/example1/project1.lpi
@@ -27,19 +27,16 @@
         <FormatVersion Value="1"/>
       </local>
     </RunParams>
-    <RequiredPackages Count="4">
+    <RequiredPackages Count="3">
       <Item1>
         <PackageName Value="jujiboutils"/>
       </Item1>
       <Item2>
-        <PackageName Value="MemDSLaz"/>
+        <PackageName Value="FCL"/>
       </Item2>
       <Item3>
-        <PackageName Value="FCL"/>
-      </Item3>
-      <Item4>
         <PackageName Value="LCL"/>
-      </Item4>
+      </Item3>
     </RequiredPackages>
     <Units Count="2">
       <Unit0>
diff --git a/components/jujiboutils/examples/example1/project1.lpr b/components/jujiboutils/examples/example1/project1.lpr
index d24ce70b2..0175aa8c5 100644
--- a/components/jujiboutils/examples/example1/project1.lpr
+++ b/components/jujiboutils/examples/example1/project1.lpr
@@ -8,8 +8,7 @@ uses
   {$ENDIF}clocale,
   {$ENDIF}
   Interfaces, // this includes the LCL widgetset
-  Forms, main, memdslaz
-  { you can add units after this };
+  Forms, main;
 
 {$R *.res}
 
diff --git a/components/jujiboutils/examples/examplenodb/main.lfm b/components/jujiboutils/examples/examplenodb/main.lfm
index 3fc106118..96a06101d 100644
--- a/components/jujiboutils/examples/examplenodb/main.lfm
+++ b/components/jujiboutils/examples/examplenodb/main.lfm
@@ -1,12 +1,13 @@
 object Form1: TForm1
   Left = 365
   Height = 184
+  Hint = 'Try Alt+Down arrow key to show the calendar'
   Top = 261
-  Width = 444
+  Width = 445
   Caption = 'Example'
   ClientHeight = 184
-  ClientWidth = 444
-  OnCreate = FormCreate
+  ClientWidth = 445
+  ShowHint = True
   LCLVersion = '1.1'
   object Label1: TLabel
     Left = 8
@@ -70,6 +71,7 @@ object Form1: TForm1
     object JLabeledDateEdit1: TJLabeledDateEdit
       Left = 190
       Height = 27
+      Hint = 'Try Alt+Down Arrow key to show the calendar'
       Top = 22
       Width = 80
       DisplayFormat = 'dd/mm/yy'
@@ -88,7 +90,7 @@ object Form1: TForm1
       TabOrder = 2
     end
     object JLabeledFloatEdit1: TJLabeledFloatEdit
-      Left = 302
+      Left = 298
       Height = 27
       Top = 22
       Width = 80
@@ -99,7 +101,7 @@ object Form1: TForm1
       EditLabel.AnchorSideRight.Control = JLabeledFloatEdit1
       EditLabel.AnchorSideRight.Side = asrBottom
       EditLabel.AnchorSideBottom.Control = JLabeledFloatEdit1
-      EditLabel.Left = 302
+      EditLabel.Left = 298
       EditLabel.Height = 17
       EditLabel.Top = 2
       EditLabel.Width = 80
@@ -109,7 +111,7 @@ object Form1: TForm1
     end
   end
   object BitBtn1: TBitBtn
-    Left = 333
+    Left = 334
     Height = 30
     Top = 138
     Width = 91
diff --git a/components/jujiboutils/examples/examplenodb/main.pas b/components/jujiboutils/examples/examplenodb/main.pas
index 714d1bbcb..ad98b7073 100644
--- a/components/jujiboutils/examples/examplenodb/main.pas
+++ b/components/jujiboutils/examples/examplenodb/main.pas
@@ -22,7 +22,6 @@ type
     JLabeledIntegerEdit1: TJLabeledIntegerEdit;
     JLabeledIntegerEdit2: TJLabeledIntegerEdit;
     Label1: TLabel;
-    procedure FormCreate(Sender: TObject);
   private
     { private declarations }
   public
@@ -36,12 +35,5 @@ implementation
 
 {$R *.lfm}
 
-{ TForm1 }
-
-procedure TForm1.FormCreate(Sender: TObject);
-begin
-
-end;
-
 end.
 
diff --git a/components/jujiboutils/examples/testgridctr/main.lfm b/components/jujiboutils/examples/testgridctr/main.lfm
index d6e65ce44..d8d298dd7 100644
--- a/components/jujiboutils/examples/testgridctr/main.lfm
+++ b/components/jujiboutils/examples/testgridctr/main.lfm
@@ -7,7 +7,7 @@ object Form1: TForm1
   ClientHeight = 347
   ClientWidth = 419
   OnCreate = FormCreate
-  LCLVersion = '0.9.31'
+  LCLVersion = '1.1'
   object DBNavigator1: TDBNavigator
     Left = 8
     Height = 25
@@ -29,57 +29,54 @@ object Form1: TForm1
   object JDBGridControl1: TJDBGridControl
     Left = 8
     Height = 192
-    Top = 112
+    Top = 96
     Width = 392
+    AlternateColor = clMoneyGreen
+    AutoFillColumns = True
     Color = clWindow
     Columns = <    
       item
         Title.Caption = 'ID'
-        Title.PrefixOption = poNone
+        Width = 121
         FieldName = 'ID'
+        Decimals = 0
+        MaxLength = 0
       end    
       item
         Title.Caption = 'DATE'
-        Title.PrefixOption = poNone
+        Width = 121
         FieldName = 'DATE'
+        DisplayFormat = 'dd/mm/yyyy'
+        Decimals = 0
+        MaxLength = 0
       end    
       item
         Title.Caption = 'QUANTITY'
-        Title.PrefixOption = poNone
-        Width = 150
+        Width = 121
         FieldName = 'QUANTITY'
         DisplayFormat = '#,0.00000€'
+        Decimals = 0
+        MaxLength = 0
       end>
     DataSource = Datasource1
     TabOrder = 1
   end
-  object MemDataset1: TMemDataset
-    Active = True
-    FieldDefs = <    
-      item
-        Name = 'ID'
-        DataType = ftInteger
-        Precision = 0
-        Size = 0
-      end    
-      item
-        Name = 'DATE'
-        DataType = ftDate
-        Precision = 0
-        Size = 0
-      end    
-      item
-        Name = 'QUANTITY'
-        DataType = ftFloat
-        Precision = 0
-        Size = 0
-      end>
-    left = 232
-    top = 8
+  object Label1: TLabel
+    Left = 13
+    Height = 17
+    Top = 296
+    Width = 391
+    Caption = 'Press Alt+Down arrow key while editing date to show the calendar'
+    ParentColor = False
   end
   object Datasource1: TDatasource
-    DataSet = MemDataset1
+    DataSet = BufDataset1
     left = 324
     top = 7
   end
+  object BufDataset1: TBufDataset
+    FieldDefs = <>
+    left = 232
+    top = 7
+  end
 end
diff --git a/components/jujiboutils/examples/testgridctr/main.pas b/components/jujiboutils/examples/testgridctr/main.pas
index ba46fe565..0187ceaa4 100644
--- a/components/jujiboutils/examples/testgridctr/main.pas
+++ b/components/jujiboutils/examples/testgridctr/main.pas
@@ -5,18 +5,19 @@ unit main;
 interface
 
 uses
-  Classes, SysUtils, memds, db, FileUtil, Forms, Controls, Graphics, Dialogs,
-  DbCtrls, DBGrids, JDBGridControl;
+  Classes, SysUtils, db, BufDataset, FileUtil, Forms, Controls, Graphics,
+  Dialogs, DbCtrls, DBGrids, StdCtrls, JDBGridControl;
 
 type
 
   { TForm1 }
 
   TForm1 = class(TForm)
+    BufDataset1: TBufDataset;
     Datasource1: TDatasource;
     DBNavigator1: TDBNavigator;
     JDBGridControl1: TJDBGridControl;
-    MemDataset1: TMemDataset;
+    Label1: TLabel;
     procedure FormCreate(Sender: TObject);
   private
     { private declarations }
@@ -37,16 +38,24 @@ procedure TForm1.FormCreate(Sender: TObject);
 var
   i: integer;
 begin
-  // populate the memDataset
+  // Create BufDataset
+  with BufDataset1.FieldDefs do
+  begin
+    Add('ID', ftInteger, 0, False);
+    Add('DATE', ftDate, 0, False);
+    Add('QUANTITY', ftCurrency, 0, False);
+  end;
+  BufDataset1.CreateDataset;
+  // populate
   for i := 1 to 10 do
   begin
-    MemDataset1.Append;
-    MemDataset1.FieldByName('ID').AsInteger := i;
-    MemDataset1.FieldByName('DATE').AsDateTime := Now;
-    MemDataset1.FieldByName('QUANTITY').AsFloat := i * i * i;
-    MemDataset1.Post;
+    BufDataset1.Append;
+    BufDataset1.FieldByName('ID').AsInteger := i;
+    BufDataset1.FieldByName('DATE').AsDateTime := Now;
+    BufDataset1.FieldByName('QUANTITY').AsFloat := i * i * i;
+    BufDataset1.Post;
   end;
-  MemDataset1.First;
+  BufDataset1.First;
 end;
 
 end.
diff --git a/components/jujiboutils/examples/testgridctr/testgridctr.lpi b/components/jujiboutils/examples/testgridctr/testgridctr.lpi
index b21c22eda..dd6f3d835 100644
--- a/components/jujiboutils/examples/testgridctr/testgridctr.lpi
+++ b/components/jujiboutils/examples/testgridctr/testgridctr.lpi
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <CONFIG>
   <ProjectOptions>
     <Version Value="9"/>
@@ -25,10 +25,9 @@
     <RunParams>
       <local>
         <FormatVersion Value="1"/>
-        <LaunchingApplication PathPlusParams="/usr/bin/xterm -T 'Lazarus Run Output' -e $(LazarusDir)/tools/runwait.sh $(TargetCmdLine)"/>
       </local>
     </RunParams>
-    <RequiredPackages Count="4">
+    <RequiredPackages Count="3">
       <Item1>
         <PackageName Value="jujiboutils"/>
       </Item1>
@@ -36,11 +35,8 @@
         <PackageName Value="FCL"/>
       </Item2>
       <Item3>
-        <PackageName Value="MemDSLaz"/>
-      </Item3>
-      <Item4>
         <PackageName Value="LCL"/>
-      </Item4>
+      </Item3>
     </RequiredPackages>
     <Units Count="2">
       <Unit0>
@@ -52,13 +48,14 @@
         <Filename Value="main.pas"/>
         <IsPartOfProject Value="True"/>
         <ComponentName Value="Form1"/>
+        <HasResources Value="True"/>
         <ResourceBaseClass Value="Form"/>
         <UnitName Value="main"/>
       </Unit1>
     </Units>
   </ProjectOptions>
   <CompilerOptions>
-    <Version Value="10"/>
+    <Version Value="11"/>
     <Target>
       <Filename Value="testgridctr"/>
     </Target>
@@ -67,10 +64,6 @@
       <UnitOutputDirectory Value="lib/$(TargetCPU)-$(TargetOS)"/>
     </SearchPaths>
     <Linking>
-      <Debugging>
-        <GenerateDebugInfo Value="True"/>
-        <DebugInfoType Value="dsAuto"/>
-      </Debugging>
       <Options>
         <Win32>
           <GraphicApplication Value="True"/>
diff --git a/components/jujiboutils/examples/testgridctr/testgridctr.lpr b/components/jujiboutils/examples/testgridctr/testgridctr.lpr
index 8df3973cb..a81747d0e 100644
--- a/components/jujiboutils/examples/testgridctr/testgridctr.lpr
+++ b/components/jujiboutils/examples/testgridctr/testgridctr.lpr
@@ -7,7 +7,7 @@ uses
   cthreads,
   {$ENDIF}clocale,{$ENDIF}
   Interfaces, // this includes the LCL widgetset
-  Forms, memdslaz, main
+  Forms, main
   { you can add units after this };
 
 {$R *.res}