diff --git a/demos/xlsx_builder_pkg_demo.sql b/demos/xlsx_builder_pkg_demo.sql
index 712cd52..cfd9e99 100755
--- a/demos/xlsx_builder_pkg_demo.sql
+++ b/demos/xlsx_builder_pkg_demo.sql
@@ -1,12 +1,13 @@
 -- see http://technology.amis.nl/blog/10995/create-an-excel-file-with-plsql
 
 begin
+  xlsx_builder_pkg.clear_workbook;
   xlsx_builder_pkg.new_sheet;
   xlsx_builder_pkg.cell( 5, 1, 5 );
   xlsx_builder_pkg.cell( 3, 1, 3 );
   xlsx_builder_pkg.cell( 2, 2, 45 );
   xlsx_builder_pkg.cell( 3, 2, 'Anton Scheffer', p_alignment => xlsx_builder_pkg.get_alignment( p_wraptext => true ) );
-  xlsx_builder_pkg.cell( 1, 4, sysdate );
+  xlsx_builder_pkg.cell( 1, 4, sysdate, p_fontId => xlsx_builder_pkg.get_font( 'Calibri', p_rgb => 'FFFF0000' ) );
   xlsx_builder_pkg.cell( 2, 4, sysdate, p_numFmtId => xlsx_builder_pkg.get_numFmt( 'dd/mm/yyyy h:mm' ) );
   xlsx_builder_pkg.cell( 3, 4, sysdate, p_numFmtId => xlsx_builder_pkg.get_numFmt( xlsx_builder_pkg.orafmt2excel( 'dd/mon/yyyy' ) ) );
   xlsx_builder_pkg.cell( 5, 5, 75, p_borderId => xlsx_builder_pkg.get_border( 'double', 'double', 'double', 'double' ) );
@@ -33,5 +34,71 @@ begin
 end;
 /
 
+-- Create an Excel file with validation
+begin
+  xlsx_builder_pkg.clear_workbook;
+  xlsx_builder_pkg.new_sheet;
+  xlsx_builder_pkg.cell( 1, 6, 5 );
+  xlsx_builder_pkg.cell( 1, 7, 3 );
+  xlsx_builder_pkg.cell( 1, 8, 7 );
+  xlsx_builder_pkg.new_sheet;
+  xlsx_builder_pkg.cell( 2, 6, 15, p_sheet => 2 );
+  xlsx_builder_pkg.cell( 2, 7, 13, p_sheet => 2 );
+  xlsx_builder_pkg.cell( 2, 8, 17, p_sheet => 2 );
+  xlsx_builder_pkg.list_validation( 6, 3, 1, 6, 1, 8, p_show_error => true, p_sheet => 1 );
+  xlsx_builder_pkg.defined_name( 2, 6, 2, 8, 'Anton', 2 );
+  xlsx_builder_pkg.list_validation
+    ( 6, 1, 'Anton'
+    , p_style => 'information'
+    , p_title => 'valid values are'
+    , p_prompt => '13, 15 and 17'
+    , p_show_error => true
+    , p_error_title => 'Are you sure?'
+    , p_error_txt => 'Valid values are: 13, 15 and 17'
+    , p_sheet => 1 );
+  xlsx_builder_pkg.save( 'MY_DIR', 'my.xlsx' );
+end;
+/
 
 
+begin
+  xlsx_builder_pkg.clear_workbook;
+  xlsx_builder_pkg.new_sheet;
+  xlsx_builder_pkg.cell( 1, 6, 5 );
+  xlsx_builder_pkg.cell( 1, 7, 3 );
+  xlsx_builder_pkg.cell( 1, 8, 7 );
+  xlsx_builder_pkg.set_autofilter( 1,1, p_row_start => 5, p_row_end => 8 );
+  xlsx_builder_pkg.new_sheet;
+  xlsx_builder_pkg.cell( 2, 6, 5 );
+  xlsx_builder_pkg.cell( 2, 7, 3 );
+  xlsx_builder_pkg.cell( 2, 8, 7 );
+  xlsx_builder_pkg.set_autofilter( 2,2, p_row_start => 5, p_row_end => 8 );
+  xlsx_builder_pkg.save( 'MY_DIR', 'my.xlsx' );
+end;
+/
+
+-- Create workbook with frozen cells
+begin
+  xlsx_builder_pkg.clear_workbook;
+  xlsx_builder_pkg.new_sheet;
+  for c in 1 .. 10
+  loop
+    xlsx_builder_pkg.cell( c, 1, 'COL' || c );
+    xlsx_builder_pkg.cell( c, 2, 'val' || c );
+    xlsx_builder_pkg.cell( c, 3, c );
+  end loop;
+  xlsx_builder_pkg.freeze_rows( 1 );
+  xlsx_builder_pkg.new_sheet;
+  for r in 1 .. 10
+  loop
+    xlsx_builder_pkg.cell( 1, r, 'ROW' || r );
+    xlsx_builder_pkg.cell( 2, r, 'val' || r );
+    xlsx_builder_pkg.cell( 3, r, r );
+  end loop;
+  xlsx_builder_pkg.freeze_cols( 3 );
+  xlsx_builder_pkg.new_sheet;
+  xlsx_builder_pkg.cell( 3, 3, 'Start freeze' );
+  xlsx_builder_pkg.freeze_pane( 3,3 );
+  xlsx_builder_pkg.save( 'MY_DIR', 'my.xlsx' );
+end;
+/
diff --git a/ora/xlsx_builder_pkg.pks b/ora/xlsx_builder_pkg.pks
index 5d8d1ef..67f922e 100755
--- a/ora/xlsx_builder_pkg.pks
+++ b/ora/xlsx_builder_pkg.pks
@@ -306,103 +306,5 @@ top
     , p_filename varchar2 := null
     , p_sheet pls_integer := null
     );
---
-/* Example
-begin
-  xlsx_builder_pkg.clear_workbook;
-  xlsx_builder_pkg.new_sheet;
-  xlsx_builder_pkg.cell( 5, 1, 5 );
-  xlsx_builder_pkg.cell( 3, 1, 3 );
-  xlsx_builder_pkg.cell( 2, 2, 45 );
-  xlsx_builder_pkg.cell( 3, 2, 'Anton Scheffer', p_alignment => xlsx_builder_pkg.get_alignment( p_wraptext => true ) );
-  xlsx_builder_pkg.cell( 1, 4, sysdate, p_fontId => xlsx_builder_pkg.get_font( 'Calibri', p_rgb => 'FFFF0000' ) );
-  xlsx_builder_pkg.cell( 2, 4, sysdate, p_numFmtId => xlsx_builder_pkg.get_numFmt( 'dd/mm/yyyy h:mm' ) );
-  xlsx_builder_pkg.cell( 3, 4, sysdate, p_numFmtId => xlsx_builder_pkg.get_numFmt( xlsx_builder_pkg.orafmt2excel( 'dd/mon/yyyy' ) ) );
-  xlsx_builder_pkg.cell( 5, 5, 75, p_borderId => xlsx_builder_pkg.get_border( 'double', 'double', 'double', 'double' ) );
-  xlsx_builder_pkg.cell( 2, 3, 33 );
-  xlsx_builder_pkg.hyperlink( 1, 6, 'http://www.amis.nl', 'Amis site' );
-  xlsx_builder_pkg.cell( 1, 7, 'Some merged cells', p_alignment => xlsx_builder_pkg.get_alignment( p_horizontal => 'center' ) );
-  xlsx_builder_pkg.mergecells( 1, 7, 3, 7 );
-  for i in 1 .. 5
-  loop
-    xlsx_builder_pkg.comment( 3, i + 3, 'Row ' || (i+3), 'Anton' );
-  end loop;
-  xlsx_builder_pkg.new_sheet;
-  xlsx_builder_pkg.set_row( 1, p_fillId => xlsx_builder_pkg.get_fill( 'solid', 'FFFF0000' ) ) ;
-  for i in 1 .. 5
-  loop
-    xlsx_builder_pkg.cell( 1, i, i );
-    xlsx_builder_pkg.cell( 2, i, i * 3 );
-    xlsx_builder_pkg.cell( 3, i, 'x ' || i * 3 );
-  end loop;
-  xlsx_builder_pkg.query2sheet( 'select rownum, x.*
-, case when mod( rownum, 2 ) = 0 then rownum * 3 end demo
-, case when mod( rownum, 2 ) = 1 then ''demo '' || rownum end demo2 from dual x connect by rownum <= 5' );
-  xlsx_builder_pkg.save( 'MY_DIR', 'my.xlsx' );
 end;
---
-begin
-  xlsx_builder_pkg.clear_workbook;
-  xlsx_builder_pkg.new_sheet;
-  xlsx_builder_pkg.cell( 1, 6, 5 );
-  xlsx_builder_pkg.cell( 1, 7, 3 );
-  xlsx_builder_pkg.cell( 1, 8, 7 );
-  xlsx_builder_pkg.new_sheet;
-  xlsx_builder_pkg.cell( 2, 6, 15, p_sheet => 2 );
-  xlsx_builder_pkg.cell( 2, 7, 13, p_sheet => 2 );
-  xlsx_builder_pkg.cell( 2, 8, 17, p_sheet => 2 );
-  xlsx_builder_pkg.list_validation( 6, 3, 1, 6, 1, 8, p_show_error => true, p_sheet => 1 );
-  xlsx_builder_pkg.defined_name( 2, 6, 2, 8, 'Anton', 2 );
-  xlsx_builder_pkg.list_validation
-    ( 6, 1, 'Anton'
-    , p_style => 'information'
-    , p_title => 'valid values are'
-    , p_prompt => '13, 15 and 17'
-    , p_show_error => true
-    , p_error_title => 'Are you sure?'
-    , p_error_txt => 'Valid values are: 13, 15 and 17'
-    , p_sheet => 1 );
-  xlsx_builder_pkg.save( 'MY_DIR', 'my.xlsx' );
-end;
---
-begin
-  xlsx_builder_pkg.clear_workbook;
-  xlsx_builder_pkg.new_sheet;
-  xlsx_builder_pkg.cell( 1, 6, 5 );
-  xlsx_builder_pkg.cell( 1, 7, 3 );
-  xlsx_builder_pkg.cell( 1, 8, 7 );
-  xlsx_builder_pkg.set_autofilter( 1,1, p_row_start => 5, p_row_end => 8 );
-  xlsx_builder_pkg.new_sheet;
-  xlsx_builder_pkg.cell( 2, 6, 5 );
-  xlsx_builder_pkg.cell( 2, 7, 3 );
-  xlsx_builder_pkg.cell( 2, 8, 7 );
-  xlsx_builder_pkg.set_autofilter( 2,2, p_row_start => 5, p_row_end => 8 );
-  xlsx_builder_pkg.save( 'MY_DIR', 'my.xlsx' );
-end;
---
-begin
-  xlsx_builder_pkg.clear_workbook;
-  xlsx_builder_pkg.new_sheet;
-  for c in 1 .. 10
-  loop
-    xlsx_builder_pkg.cell( c, 1, 'COL' || c );
-    xlsx_builder_pkg.cell( c, 2, 'val' || c );
-    xlsx_builder_pkg.cell( c, 3, c );
-  end loop;
-  xlsx_builder_pkg.freeze_rows( 1 );
-  xlsx_builder_pkg.new_sheet;
-  for r in 1 .. 10
-  loop
-    xlsx_builder_pkg.cell( 1, r, 'ROW' || r );
-    xlsx_builder_pkg.cell( 2, r, 'val' || r );
-    xlsx_builder_pkg.cell( 3, r, r );
-  end loop;
-  xlsx_builder_pkg.freeze_cols( 3 );
-  xlsx_builder_pkg.new_sheet;
-  xlsx_builder_pkg.cell( 3, 3, 'Start freeze' );
-  xlsx_builder_pkg.freeze_pane( 3,3 );
-  xlsx_builder_pkg.save( 'MY_DIR', 'my.xlsx' );
-end;
-*/
-end;
-/
\ No newline at end of file
+/